Fix behavior of theme switching when impersonating accounts

web/inc/main.php

@@ -158,10 +158,12 @@ function top_panel($user, $TAB) {
     $panel = json_decode(implode('', $output), true);
     unset($output);
 
-    if (isset($panel[$user]['THEME'])) {
+    // Load user's selected theme and do not change it when impersonting user
+    if ( (isset($panel[$user]['THEME'])) && (!isset($_SESSION['look']) )) {
         $_SESSION['userTheme'] = $panel[$user]['THEME'];
     }
-
+    
+    // Unset userTheme override variable if POLICY_USER_CHANGE_THEME is set to no
     if ($_SESSION['POLICY_USER_CHANGE_THEME'] === 'no') {
         unset($_SESSION['userTheme']);
     }

web/login/index.php

@@ -32,7 +32,6 @@ if (isset($_SESSION['user'])) {
                 reset($data);
                 $_SESSION['look'] = key($data);
                 // Reset account details for File Manager to impersonated user
-                //unset($_SESSION['userTheme']);
                 unset($_SESSION['_sf2_attributes']);
                 unset($_SESSION['_sf2_meta']);
                 header("Location: /login/");
@@ -186,10 +185,6 @@ function authenticate_user($user, $password, $twofa = ''){
                 $_SESSION['MURMUR'] = $_POST['murmur'];
 
                 $_SESSION['userContext'] = $data[$user]['ROLE'];
-                $_SESSION['userTheme'] = $data[$user]['THEME'];
-                if ($_SESSION['POLICY_USER_CHANGE_THEME'] === 'no') {
-                    unset($_SESSION['userTheme']);
-                }
 
                 // Define language
                 $output = '';