Update theme option

web/edit/server/index.php

@@ -752,12 +752,13 @@ if (!empty($_POST['save'])) {
 
     // Change POLICY_USER_CHANGE_THEME
     if (empty($_SESSION['error_msg'])) {
-        if ($_POST['v_policy_user_change_theme'] != $_SESSION['POLICY_USER_CHANGE_THEME']) {
-            exec (HESTIA_CMD."v-change-sys-config-value POLICY_USER_CHANGE_THEME ".escapeshellarg($_POST['v_policy_user_change_theme']), $output, $return_var);
-            check_return_code($return_var,$output);
-            unset($output);
-            if (empty($_SESSION['error_msg'])) $v_policy_user_change_theme = $_POST['v_policy_user_change_theme'];
-            $v_security_adv = 'yes';
+        if ($_POST['v_policy_user_change_theme'] == 'on') { $_POST['v_policy_user_change_theme'] = 'no'; } else { $_POST['v_policy_user_change_theme'] = 'yes'; } {
+            if ($_POST['v_policy_user_change_theme'] != $_SESSION['POLICY_USER_CHANGE_THEME']) {
+                exec (HESTIA_CMD."v-change-sys-config-value POLICY_USER_CHANGE_THEME ".escapeshellarg($_POST['v_policy_user_change_theme']), $output, $return_var);
+                check_return_code($return_var,$output);
+                unset($output);
+                if (empty($_SESSION['error_msg'])) $v_policy_user_change_theme = $_POST['v_policy_user_change_theme'];
+            }
         }
     }
 

web/templates/admin/edit_server.html

@@ -118,11 +118,15 @@
                                                         }
                                                     ?>
                                                 </select>
-                                                <br><br>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text input-label">
+                                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_policy_user_change_theme" <?php if ((isset($_SESSION['POLICY_USER_CHANGE_THEME'])) && (!empty($_SESSION['POLICY_USER_CHANGE_THEME'])) && ($_SESSION['POLICY_USER_CHANGE_THEME'] == "no")) echo "checked=yes" ?>><?php print _('Set as selected theme for all users');?></label>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text input-label step-top">
                                                 <?php print _('Default Language');?>
                                             </td>
                                         </tr>
@@ -1181,20 +1185,6 @@
                                                 <br><br>
                                             </td>
                                         </tr>
-                                        <tr>
-                                            <td class="vst-text input-label">
-                                                <?php print _('Allow users to change user interface theme');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_policy_user_change_theme">
-                                                    <option value='yes' <?php if($_SESSION['POLICY_USER_CHANGE_THEME'] !== 'no') echo 'selected' ?>><?php print _('yes'); ?></option>
-                                                    <option value='no' <?php if($_SESSION['POLICY_USER_CHANGE_THEME'] == 'no') echo 'selected' ?>><?php print _('no'); ?></option>
-                                                </select>
-                                                <br><br>
-                                            </td>
-                                        </tr>
                                         <tr>
                                             <td class="vst-text input-label step-top" style="font-size:1rem;padding-bottom:12px;">
                                                 <?=_('Domains');?>

web/templates/admin/list_stats.html

@@ -28,12 +28,16 @@
                   <option value=""><?=_('show per user')?></option>
                     <?
                       foreach ($users as $key => $value) {
+                        if (($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes') && ($value === 'admin')) {
+
+                        } else {
                         echo "\t\t\t\t<option value=\"".$value."\"";
                         if ((!empty($v_user)) && ( $value == $_GET['user'])){
                           echo ' selected';
                         }
                           echo ">".$value."</option>\n";
                         }
+                      }
                       ?>
                 </select>
               </div>