Update switch for hide system admin

Author: Kristan Kenney

bin/v-list-sys-config

@@ -76,7 +76,7 @@ json_list() {
         "API": "'$API'",
         "API_ALLOWED_IP": "'$API_ALLOWED_IP'",
         "RESTRICTED_ADMIN": "'$RESTRICTED_ADMIN'",
-        "HIDE_ADMIN_ACCOUNT": "'$HIDE_ADMIN_ACCOUNT'",
+        "POLICY_SYSTEM_HIDE_ADMIN": "'$POLICY_SYSTEM_HIDE_ADMIN'",
         "POLICY_USER_EDIT_DETAILS": "'$POLICY_USER_EDIT_DETAILS'",
         "POLICY_USER_DELETE_LOGS": "'$POLICY_USER_DELETE_LOGS'",
         "POLICY_USER_VIEW_LOGS": "'$POLICY_USER_VIEW_LOGS'"
@@ -179,7 +179,7 @@ shell_list() {
     echo "Debug Mode:                       $DEBUG_MODE"
     echo "Theme:                            $THEME"
     echo "Restricted Admin Access:          $RESTRICTED_ADMIN"
-    echo "Hide System Administator:         $HIDE_ADMIN_ACCOUNT"
+    echo "Hide System Administator:         $POLICY_SYSTEM_HIDE_ADMIN"
     echo "Updates: Notify by email:         $UPGRADE_SEND_EMAIL"
     echo "Updates: Email install log:       $UPGRADE_SEND_EMAIL_LOG"
 }
@@ -196,7 +196,7 @@ plain_list() {
     echo -ne "$SMTP_RELAY_HOST\t$SMTP_RELAY_PORT\t$SMTP_RELAY_USER\t"
     echo -ne "$UPGRADE_SEND_EMAIL\t$UPGRADE_SEND_EMAIL_LOG\t$THEME\t$LANGUAGE\t$BACKUP_GZIP\t"
     echo -ne "$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL\t\t$DEBUG_MODE\t$API\t$API_ALLOWED_IP"
-    echo -e "$RESTRICTED_ADMIN\t$HIDE_ADMIN_ACCOUNT"
+    echo -e "$RESTRICTED_ADMIN\t$POLICY_SYSTEM_HIDE_ADMIN"
 }
 
 
@@ -214,7 +214,7 @@ csv_list() {
     echo -n "'UPGRADE_SEND_EMAIL','UPGRADE_SEND_EMAIL_LOG',"
     echo -n "'THEME', 'LANGUAGE','BACKUP_GZIP','BACKUP','WEBMAIL_ALIAS',"
     echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS','DEBUG_MODE','API','API_ALLOWED_IP',"
-    echo -n "'RESTRICTED_ADMIN',HIDE_ADMIN_ACCOUNT'"
+    echo -n "'RESTRICTED_ADMIN',POLICY_SYSTEM_HIDE_ADMIN'"
     echo
     echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL',"
     echo -n "'$WEB_SSL_PORT','$WEB_BACKEND','$PROXY_SYSTEM','$PROXY_PORT',"
@@ -226,7 +226,7 @@ csv_list() {
     echo -n "'$SMTP_RELAY','$SMTP_RELAY_HOST','$SMTP_RELAY_PORT','$SMTP_RELAY_USER',"
     echo -n "'$UPGRADE_SEND_EMAIL','$UPGRADE_SEND_EMAIL_LOG','$THEME','$LANGUAGE',"
     echo -n "'$BACKUP_GZIP','$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL'"
-    echo -n "'$DEBUG_MODE','$API','$API_ALLOWED_IP','$RESTRICTED_ADMIN,$HIDE_ADMIN_ACCOUNT"
+    echo -n "'$DEBUG_MODE','$API','$API_ALLOWED_IP','$RESTRICTED_ADMIN,$POLICY_SYSTEM_HIDE_ADMIN"
 
     echo
 }

web/edit/server/index.php

@@ -741,11 +741,11 @@
 
     // Change RESTRICTED_ADMIN
     if (empty($_SESSION['error_msg'])) {
-        if ($_POST['v_hide_admin'] != $_SESSION['HIDE_ADMIN_ACCOUNT']) {
-            exec (HESTIA_CMD."v-change-sys-config-value HIDE_ADMIN_ACCOUNT ".escapeshellarg($_POST['v_hide_admin']), $output, $return_var);
+        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);
             check_return_code($return_var,$output);
             unset($output);
-            if (empty($_SESSION['error_msg'])) $v_enforce_subdomain_ownership = $_POST['v_hide_admin'];
+            if (empty($_SESSION['error_msg'])) $v_enforce_subdomain_ownership = $_POST['v_policy_system_hide_admin'];
             $v_security_adv = 'yes';
         }
     }

web/templates/admin/edit_server.html

@@ -1048,9 +1048,9 @@
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <select class="vst-list" name="v_hide_admin">
+                                                    <select class="vst-list" name="v_policy_system_hide_admin">
                                                         <option value='yes'><?php print _('yes'); ?></option>
-                                                        <option value='no' <?php if($_SESSION['HIDE_ADMIN_ACCOUNT'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
+                                                        <option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
                                                     </select>
                                                     <br><br>
                                                 </td>

web/templates/admin/list_user.html

@@ -97,7 +97,7 @@
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred';?> animated fadeIn" v_section="user"
 v_unit_id="<?=$key?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=strtolower($key)?>"
 sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<? if($_SESSION['favourites']['USER'][$key] == 1) echo '1'; else echo '0'; ?>">
-        <div class="l-unit__col l-unit__col--right" style="<? if (($_SESSION['HIDE_ADMIN_ACCOUNT'] === 'yes') && ($_SESSION['user'] !== 'admin') && ($key === 'admin')) { echo 'display: none';} else {echo 'display: table-cell';}?>">
+        <div class="l-unit__col l-unit__col--right" style="<? if (($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes') && ($_SESSION['user'] !== 'admin') && ($key === 'admin')) { echo 'display: none';} else {echo 'display: table-cell';}?>">
           <div class="clearfix l-unit__stat-col--left super-compact">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" title="<?=_('Select')?>" name="user[]" value="<?=$key?>">
           </div>

web/templates/admin/panel.html

@@ -72,7 +72,13 @@
 				<a href="/list/user/">
 					<div class="l-stat__col-title"><?=_('USER')?>&nbsp;&nbsp;<i class="fas fa-users"></i></div>
 					<ul>
-						<li><?=_('users')?>: <span><?=$panel[$user]['U_USERS']?></span></li>
+						<li><?=_('users')?>: <span>
+							<? if (($_SESSION['user'] !== 'admin') && ($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes')) {
+								$user_count = $panel[$user]['U_USERS'] - 1;
+							} else {
+								$user_count = $panel[$user]['U_USERS'];
+							} ?>
+							<?=htmlspecialchars($user_count);?></span></li>
 						<li><?=_('spnd');?>: <span><?=$panel[$user]['SUSPENDED_USERS']?></span></li>
 					</ul>
 				</a>