From 69675151bfd7c7eb149f43fa412ba0a0e3f6c64e Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Sun, 5 Jul 2020 20:40:44 -0700
Subject: [PATCH] Remove monitor remote access settings
* Tautulli/Tautulli-Issues#251
---
data/interfaces/default/settings.html | 81 ---------------------------
plexpy/webserve.py | 7 +--
2 files changed, 1 insertion(+), 87 deletions(-)
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 9d8fcc20..a8f5e742 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -775,7 +775,6 @@
- Not available for Plex Cloud servers.
Use the user defined connection details. Do not retrieve the server connection URL automatically.
@@ -866,36 +864,6 @@
-
@@ -2158,7 +2126,6 @@ $(document).ready(function() {
initConfigCheckbox('#https_create_cert');
initConfigCheckbox('#check_github');
initConfigCheckbox('#monitor_pms_updates');
- initConfigCheckbox('#monitor_remote_access');
initConfigCheckbox('#newsletter_self_hosted');
$('#menu_link_shutdown').click(function() {
@@ -2404,7 +2371,6 @@ $(document).ready(function() {
$('#pms_is_cloud').val(is_cloud !== 'undefined' && is_cloud === true ? 1 : 0);
$('#pms_url_manual').prop('checked', false);
$('#pms_url').val('Please verify your server above to retrieve the URL');
- PMSCloudCheck();
},
onDropdownOpen: function() {
this.clear();
@@ -2435,38 +2401,6 @@ $(document).ready(function() {
}
getServerOptions();
- function PMSCloudCheck() {
- if ($('#pms_is_cloud').val() === "1") {
- $('#pms_port').val(443).prop('readonly', true);
- $('#pms_is_remote_checkbox').prop('checked', true).prop('disabled', true);
- $('#pms_is_remote').val(1);
- $('#pms_ssl_checkbox').prop('checked', true).prop('disabled', true);
- $('#pms_ssl').val(1);
- $('#pms_url_manual').prop('checked', false).prop('disabled', true);
- $('#monitor_pms_updates').prop('checked', false).prop('disabled', true);
- $('#pms_update_options').hide();
- $('#monitor_remote_access').prop('checked', false).prop('disabled', true);
- $('#cloudManualConnection').show();
- $('#cloudMonitorUpdates').show();
- $('#cloudMonitorRemoteAccess').show();
- $('#remoteAccessCheck').hide();
- } else {
- $('#pms_port').prop('readonly', false);
- $('#pms_is_remote_checkbox').prop('disabled', false);
- $('#pms_is_remote').val($('#pms_is_remote_checkbox').is(':checked') ? 1 : 0);
- $('#pms_ssl_checkbox').prop('disabled', false);
- $('#pms_ssl').val($('#pms_ssl_checkbox').is(':checked') ? 1 : 0);
- $('#pms_url_manual').prop('disabled', false);
- $('#monitor_pms_updates').prop('disabled', false);
- $('#monitor_remote_access').prop('disabled', false);
- $('#cloudManualConnection').hide();
- $('#cloudMonitorUpdates').hide();
- $('#cloudMonitorRemoteAccess').hide();
- remoteAccessEnabledCheck()
- }
- }
- PMSCloudCheck();
-
function verifyServer(_callback) {
var pms_ip = $("#pms_ip").val();
var pms_port = $("#pms_port").val();
@@ -2583,21 +2517,6 @@ $(document).ready(function() {
pms_logs_debug = false;
pms_logs = false;
- function remoteAccessEnabledCheck() {
- $.ajax({
- url: 'get_server_pref',
- data: { pref: 'PublishServerOnPlexOnlineKey' },
- async: true,
- success: function(data) {
- if (data === 'false' || data === '0') {
- $("#remoteAccessCheck").html("Remote access must be enabled on your Plex Server.
Click here for help.");
- $("#monitor_remote_access").attr("checked", false).attr("disabled", true);
- }
- }
- });
- }
- remoteAccessEnabledCheck();
-
// Sortable home_sections
function set_home_sections() {
var home_sections = [];
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index d01af716..375db16b 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -2997,9 +2997,6 @@ class WebInterface(object):
"grouping_user_history": checked(plexpy.CONFIG.GROUPING_USER_HISTORY),
"grouping_charts": checked(plexpy.CONFIG.GROUPING_CHARTS),
"monitor_pms_updates": checked(plexpy.CONFIG.MONITOR_PMS_UPDATES),
- "monitor_remote_access": checked(plexpy.CONFIG.MONITOR_REMOTE_ACCESS),
- "remote_access_ping_interval": plexpy.CONFIG.REMOTE_ACCESS_PING_INTERVAL,
- "remote_access_ping_threshold": plexpy.CONFIG.REMOTE_ACCESS_PING_THRESHOLD,
"refresh_libraries_interval": plexpy.CONFIG.REFRESH_LIBRARIES_INTERVAL,
"refresh_libraries_on_startup": checked(plexpy.CONFIG.REFRESH_LIBRARIES_ON_STARTUP),
"refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL,
@@ -3077,7 +3074,7 @@ class WebInterface(object):
"refresh_libraries_on_startup", "refresh_users_on_startup",
"notify_consecutive", "notify_recently_added_upgrade",
"notify_group_recently_added_grandparent", "notify_group_recently_added_parent",
- "monitor_pms_updates", "monitor_remote_access", "get_file_sizes", "log_blacklist", "http_hash_password",
+ "monitor_pms_updates", "get_file_sizes", "log_blacklist", "http_hash_password",
"allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip",
"history_table_activity", "plexpy_auto_update",
"themoviedb_lookup", "tvmaze_lookup", "musicbrainz_lookup", "http_plex_admin",
@@ -3130,8 +3127,6 @@ class WebInterface(object):
kwargs.get('refresh_users_interval') != str(plexpy.CONFIG.REFRESH_USERS_INTERVAL) or \
kwargs.get('pms_update_check_interval') != str(plexpy.CONFIG.PMS_UPDATE_CHECK_INTERVAL) or \
kwargs.get('monitor_pms_updates') != plexpy.CONFIG.MONITOR_PMS_UPDATES or \
- kwargs.get('monitor_remote_access') != plexpy.CONFIG.MONITOR_REMOTE_ACCESS or \
- kwargs.get('remote_access_ping_interval') != str(plexpy.CONFIG.REMOTE_ACCESS_PING_INTERVAL) or \
kwargs.get('pms_url_manual') != plexpy.CONFIG.PMS_URL_MANUAL:
reschedule = True