From 138dc24f6462412a8ffba81c3b3d9980af360b2b Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Sun, 17 Nov 2019 05:13:48 +0000
Subject: [PATCH] Fix system style setting (#10820)

---
 LibreNMS/Config.php                                | 3 ++-
 app/Http/Controllers/UserPreferencesController.php | 2 +-
 app/Http/Middleware/LoadUserPreferences.php        | 3 +--
 app/Http/ViewComposers/MenuComposer.php            | 2 +-
 resources/views/layouts/librenmsv1.blade.php       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/LibreNMS/Config.php b/LibreNMS/Config.php
index 10c2fa2a00..1b1fe6046c 100644
--- a/LibreNMS/Config.php
+++ b/LibreNMS/Config.php
@@ -419,7 +419,8 @@ class Config
             self::set('email_from', '"' . self::get('project_name') . '" <' . self::get('email_user') . '@' . php_uname('n') . '>');
         }
 
-            // Define some variables if they aren't set by user definition in config_definitions.json
+        // Define some variables if they aren't set by user definition in config_definitions.json
+        self::set('applied_site_style', self::get('site_style'));
         self::setDefault('html_dir', '%s/html', ['install_dir']);
         self::setDefault('rrd_dir', '%s/rrd', ['install_dir']);
         self::setDefault('mib_dir', '%s/mibs', ['install_dir']);
diff --git a/app/Http/Controllers/UserPreferencesController.php b/app/Http/Controllers/UserPreferencesController.php
index 4ff7effe49..6854cc8ff2 100644
--- a/app/Http/Controllers/UserPreferencesController.php
+++ b/app/Http/Controllers/UserPreferencesController.php
@@ -59,7 +59,7 @@ class UserPreferencesController extends Controller
         $locales = $this->getValidLocales();
         $styles = $this->getValidStyles();
         $default_locale = \config('app.locale');
-        $default_style = Config::get('site_style_default', Config::get('site_style'));
+        $default_style = Config::get('site_style');
 
         $data = [
             'user' => $user,
diff --git a/app/Http/Middleware/LoadUserPreferences.php b/app/Http/Middleware/LoadUserPreferences.php
index 558abcec7e..5608d44bae 100644
--- a/app/Http/Middleware/LoadUserPreferences.php
+++ b/app/Http/Middleware/LoadUserPreferences.php
@@ -25,8 +25,7 @@ class LoadUserPreferences
         });
 
         $this->setPreference($request, 'site_style', function ($style) {
-            Config::set('site_style_default', Config::get('site_style'));
-            Config::set('site_style', $style);
+            Config::set('applied_site_style', $style);
         });
 
         return $next($request);
diff --git a/app/Http/ViewComposers/MenuComposer.php b/app/Http/ViewComposers/MenuComposer.php
index 5aca724440..588b942756 100644
--- a/app/Http/ViewComposers/MenuComposer.php
+++ b/app/Http/ViewComposers/MenuComposer.php
@@ -54,7 +54,7 @@ class MenuComposer
         $vars = [];
         /** @var User $user */
         $user = Auth::user();
-        $site_style = Config::get('site_style');
+        $site_style = Config::get('applied_site_style');
 
         //TODO: should be handled via CSS Themes
         $vars['navbar'] = in_array($site_style, ['mono', 'dark']) ? 'navbar-inverse' : '';
diff --git a/resources/views/layouts/librenmsv1.blade.php b/resources/views/layouts/librenmsv1.blade.php
index 0383f36410..c22970756a 100644
--- a/resources/views/layouts/librenmsv1.blade.php
+++ b/resources/views/layouts/librenmsv1.blade.php
@@ -41,7 +41,7 @@
     <link href="{{ asset('css/select2-bootstrap.min.css') }}" rel="stylesheet" type="text/css" />
     <link href="{{ asset('css/query-builder.default.min.css') }}" rel="stylesheet" type="text/css" />
     <link href="{{ asset(LibreNMS\Config::get('stylesheet', 'css/styles.css')) }}?ver=20190912" rel="stylesheet" type="text/css" />
-    <link href="{{ asset('css/' . LibreNMS\Config::get('site_style', 'light') . '.css?ver=632417642') }}" rel="stylesheet" type="text/css" />
+    <link href="{{ asset('css/' . LibreNMS\Config::get('applied_site_style', 'light') . '.css?ver=632417642') }}" rel="stylesheet" type="text/css" />
     @foreach(LibreNMS\Config::get('webui.custom_css', []) as $custom_css)
         <link href="{{ $custom_css }}" rel="stylesheet" type="text/css" />
     @endforeach