From 864063676f96b518fa5defa56cdadc0e218cfcd0 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Fri, 28 Oct 2016 20:53:26 -0700
Subject: [PATCH] Default http_proxy on and remove setting

---
 data/interfaces/default/settings.html | 6 ------
 plexpy/config.py                      | 2 ++
 plexpy/webserve.py                    | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index dc0c3baf..d96df248 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -413,12 +413,6 @@
                             </div>
                             <p class="help-block">The base URL of the web server. Used for reverse proxies.</p>
                         </div>
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" class="http-settings" name="http_proxy" id="http_proxy" value="1" ${config['http_proxy']}> Enable HTTP Proxy
-                            </label>
-                            <p class="help-block">Respect the X-Forwarded-Proto header. Used for reverse proxies with SSL.</p>
-                        </div>
                         <br />
                         <div class="checkbox">
                             <label>
diff --git a/plexpy/config.py b/plexpy/config.py
index e23fd507..cb0295c3 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -843,4 +843,6 @@ class Config(object):
             self.NOTIFY_SCRIPTS_ARGS_TEXT = rep(self.NOTIFY_SCRIPTS_ARGS_TEXT)
 
             self.MONITORING_USE_WEBSOCKET = 1
+            self.HTTP_PROXY = 1
+
             self.CONFIG_VERSION = 8
\ No newline at end of file
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index c36750c7..5fb74e73 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -2516,7 +2516,6 @@ class WebInterface(object):
             "http_port": plexpy.CONFIG.HTTP_PORT,
             "http_password": http_password,
             "http_root": plexpy.CONFIG.HTTP_ROOT,
-            "http_proxy": checked(plexpy.CONFIG.HTTP_PROXY),
             "launch_browser": checked(plexpy.CONFIG.LAUNCH_BROWSER),
             "enable_https": checked(plexpy.CONFIG.ENABLE_HTTPS),
             "https_create_cert": checked(plexpy.CONFIG.HTTPS_CREATE_CERT),
@@ -2610,7 +2609,7 @@ class WebInterface(object):
             "movie_logging_enable", "tv_logging_enable", "music_logging_enable",
             "notify_consecutive", "notify_upload_posters", "notify_recently_added", "notify_group_recently_added",
             "monitor_pms_updates", "monitor_remote_access", "get_file_sizes", "log_blacklist", "http_hash_password",
-            "allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip",
+            "allow_guest_access", "cache_images", "http_basic_auth", "notify_concurrent_by_ip",
             "history_table_activity", "plexpy_auto_update"
         ]
         for checked_config in checked_configs: