From 480913362e76b00aa497d438c4e7fbed7fa64bd0 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Thu, 21 Dec 2017 11:23:11 -0800
Subject: [PATCH] Fix default setup wizard settings

---
 data/interfaces/default/welcome.html | 15 +++++++++------
 plexpy/webserve.py                   | 14 +-------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html
index 934cf642..6dd0c779 100644
--- a/data/interfaces/default/welcome.html
+++ b/data/interfaces/default/welcome.html
@@ -164,12 +164,15 @@
                     <!-- Required fields but hidden -->
                     <div style="display: none;">
                         <input type="checkbox" name="first_run" id="first_run" value="1" checked>
-                        <input type="checkbox" name="launch_browser" id="launch_browser" value="1" ${config['launch_browser']}>
-                        <input type="checkbox" name="refresh_users_on_startup" id="refresh_users_on_startup" value="1" ${config['refresh_users_on_startup']}>
-                        <input type="checkbox" name="refresh_libraries_on_startup" id="refresh_libraries_on_startup" value="1" ${config['refresh_libraries_on_startup']}>
-                        <input type="checkbox" name="check_github" id="check_github" value="1" ${config['check_github']}>
-                        <input type="checkbox" name="log_blacklist" id="log_blacklist" value="1" ${config['log_blacklist']}>
-                        <input type="checkbox" name="cache_images" id="cache_images" value="1" ${config['cache_images']}>
+                        <input type="checkbox" name="group_history_tables" id="group_history_tables" value="1" checked>
+                        <input type="checkbox" name="history_table_activity" id="history_table_activity" value="1" checked>
+                        <input type="checkbox" name="launch_browser" id="launch_browser" value="1" checked>
+                        <input type="checkbox" name="api_enabled" id="api_enabled" value="1" checked>
+                        <input type="checkbox" name="refresh_users_on_startup" id="refresh_users_on_startup" value="1" checked>
+                        <input type="checkbox" name="refresh_libraries_on_startup" id="refresh_libraries_on_startup" value="1" checked>
+                        <input type="checkbox" name="check_github" id="check_github" value="1" checked>
+                        <input type="checkbox" name="log_blacklist" id="log_blacklist" value="1" checked>
+                        <input type="checkbox" name="cache_images" id="cache_images" value="1" checked>
                         <input type="checkbox" name="server_changed" id="server_changed" value="1" checked>
                         <input type="checkbox" name="first_run_complete" id="first_run_complete" value="1" checked>
                         <input type="text" name="home_stats_cards" id="home_stats_cards" value="first_run_wizard">
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 6cc3b6fc..57dc6b9a 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -98,9 +98,6 @@ class WebInterface(object):
     @requireAuth(member_of("admin"))
     def welcome(self, **kwargs):
         config = {
-            "launch_browser": checked(plexpy.CONFIG.LAUNCH_BROWSER),
-            "refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP),
-            "refresh_libraries_on_startup": checked(plexpy.CONFIG.REFRESH_LIBRARIES_ON_STARTUP),
             "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER,
             "pms_ip": plexpy.CONFIG.PMS_IP,
             "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE),
@@ -108,16 +105,7 @@ class WebInterface(object):
             "pms_token": plexpy.CONFIG.PMS_TOKEN,
             "pms_ssl": checked(plexpy.CONFIG.PMS_SSL),
             "pms_uuid": plexpy.CONFIG.PMS_UUID,
-            "movie_notify_enable": checked(plexpy.CONFIG.MOVIE_NOTIFY_ENABLE),
-            "tv_notify_enable": checked(plexpy.CONFIG.TV_NOTIFY_ENABLE),
-            "music_notify_enable": checked(plexpy.CONFIG.MUSIC_NOTIFY_ENABLE),
-            "movie_logging_enable": checked(plexpy.CONFIG.MOVIE_LOGGING_ENABLE),
-            "tv_logging_enable": checked(plexpy.CONFIG.TV_LOGGING_ENABLE),
-            "music_logging_enable": checked(plexpy.CONFIG.MUSIC_LOGGING_ENABLE),
-            "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL,
-            "check_github": checked(plexpy.CONFIG.CHECK_GITHUB),
-            "log_blacklist": checked(plexpy.CONFIG.LOG_BLACKLIST),
-            "cache_images": checked(plexpy.CONFIG.CACHE_IMAGES)
+            "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL
         }
 
         # The setup wizard just refreshes the page on submit so we must redirect to home if config set.