From 4dd05e217aca35b605f7566d85d7647fbed20cdc Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Fri, 22 Dec 2017 13:01:25 -0800
Subject: [PATCH] Add back HTTP Proxy setting

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

diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index ca49b48b..b1c5a0a1 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -357,6 +357,12 @@
                             </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 438f79e8..de5ee90c 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -863,7 +863,6 @@ class Config(object):
             self.NOTIFY_GROUP_RECENTLY_ADDED_PARENT = self.NOTIFY_GROUP_RECENTLY_ADDED
 
             self.MONITORING_USE_WEBSOCKET = 1
-            self.HTTP_PROXY = 1
 
             self.CONFIG_VERSION = 8
 
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 39ae93d9..da4086ab 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -2526,6 +2526,7 @@ 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),
@@ -2617,7 +2618,7 @@ class WebInterface(object):
             "notify_consecutive", "notify_upload_posters", "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",
-            "allow_guest_access", "cache_images", "http_basic_auth", "notify_concurrent_by_ip",
+            "allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip",
             "history_table_activity", "plexpy_auto_update",
             "themoviedb_lookup", "tvmaze_lookup"
         ]