Update logic for security options

web/edit/server/index.php

@@ -739,7 +739,7 @@ if (!empty($_POST['save'])) {
         }
     }
 
-    // Change POLICY_SYSTEM_PROTECTED_ADMIN
+    // Change POLICY_SYSTEM_HIDE_ADMIN
     if (empty($_SESSION['error_msg'])) {
         if ($_POST['v_policy_system_hide_admin'] != $_SESSION['POLICY_SYSTEM_HIDE_ADMIN']) {
             exec (HESTIA_CMD."v-change-sys-config-value POLICY_SYSTEM_HIDE_ADMIN ".escapeshellarg($_POST['v_policy_system_hide_admin']), $output, $return_var);

web/templates/admin/edit_server.html

@@ -1036,7 +1036,7 @@
                                                 <td>
                                                     <select class="vst-list" name="v_policy_system_protected_admin">
                                                         <option value='yes'><?php print _('yes'); ?></option>
-                                                        <option value='no' <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
+                                                        <option value='no' <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] !== 'yes') echo 'selected' ?>><?php print _('no'); ?></option>
                                                     </select>
                                                     <br><br>
                                                 </td>
@@ -1050,7 +1050,7 @@
                                                 <td>
                                                     <select class="vst-list" name="v_policy_system_hide_admin">
                                                         <option value='yes'><?php print _('yes'); ?></option>
-                                                        <option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
+                                                        <option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] !== 'yes') echo 'selected' ?>><?php print _('no'); ?></option>
                                                     </select>
                                                     <br><br>
                                                 </td>
@@ -1064,8 +1064,8 @@
                                         <tr>
                                             <td>
                                                 <select class="vst-list" name="v_policy_user_edit_details">
-                                                    <option value='yes'><?php print _('yes'); ?></option>
-                                                    <option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
+                                                    <option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'no') echo 'selected' ?>><?php print _('yes'); ?></option>
+                                                    <option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] == 'no') echo 'selected' ?>><?php print _('no'); ?></option>
                                                 </select>
                                                 <br><br>
                                             </td>
@@ -1078,8 +1078,8 @@
                                         <tr>
                                             <td>
                                                 <select class="vst-list" name="v_policy_user_view_logs">
-                                                    <option value='yes'><?php print _('yes'); ?></option>
-                                                    <option value='no' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
+                                                    <option value='yes' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] !== 'no') echo 'selected' ?>><?php print _('yes'); ?></option>
+                                                    <option value='no' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] == 'no') echo 'selected' ?>><?php print _('no'); ?></option>
                                                 </select>
                                                 <br><br>
                                             </td>
@@ -1092,8 +1092,8 @@
                                         <tr>
                                             <td>
                                                 <select class="vst-list" name="v_policy_user_delete_logs">
-                                                    <option value='yes'><?php print _('yes'); ?></option>
-                                                    <option value='no' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
+                                                    <option value='yes' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no') echo 'selected' ?>><?php print _('yes'); ?></option>
+                                                    <option value='no' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] == 'no') echo 'selected' ?>><?php print _('no'); ?></option>
                                                 </select>
                                                 <br><br>
                                             </td>

web/templates/admin/list_log.html

@@ -14,7 +14,7 @@
     </div>
     <div class="l-unit-toolbar__buttonstrip float-right">
       <a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-redo status-icon green"></i><?=_('Refresh')?></a>
-    <? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['user'] !== 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
+    <? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
       <!-- Hide delete buttons-->
     <? } else { ?>
       <? if (($_SESSION['userContext'] === 'admin') || (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no'))) {?>

web/templates/admin/list_log_auth.html

@@ -6,7 +6,7 @@
     <div class="l-unit-toolbar__buttonstrip float-right">
       <a href="javascript:location.reload();" class="ui-button cancel" dir="ltr"><i class="fas fa-redo status-icon green"></i><?=_('Refresh')?></a>
       <? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
-              <!-- Hide delete buttons-->
+          <!-- Hide delete buttons-->
       <? } else { ?>
         <? if (($_SESSION['userContext'] === 'admin') || (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no'))) {?>
           <div class="actions-panel display-inline-block" key-action="js">