Add PREF_UI_SORT to user.conf

bin/v-add-user

@@ -237,6 +237,7 @@ U_BACKUPS='0'
 LANGUAGE=''
 THEME=''
 NOTIFICATIONS='no'
+PREF_UI_SORT='name'
 TIME='$time'
 DATE='$date'" > $USER_DATA/user.conf
 chmod 660 $USER_DATA/user.conf

bin/v-change-user-sort-order

@@ -0,0 +1,59 @@
+#!/bin/bash
+# info: updates user role
+# options: USER SORT_ORDER
+# labels: hestia
+#
+# example: v-change-user-sort-order user date
+#
+# Changes web UI display sort order for specified user.
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument definition
+user=$1
+sort_order=$2
+
+
+# Includes
+# shellcheck source=/usr/local/hestia/func/main.sh
+source $HESTIA/func/main.sh
+# shellcheck source=/usr/local/hestia/conf/hestia.conf
+source $HESTIA/conf/hestia.conf
+# Unset THEME variable from $HESTIA/conf/hestia.conf
+unset THEME
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+# Reading user values
+source $USER_DATA/user.conf
+
+is_format_valid 'user' 'theme'
+is_object_valid 'user' 'USER' "$user"
+
+is_object_unsuspended 'user' 'USER' "$user"
+
+# Perform verification if read-only mode is enabled
+check_hestia_demo_mode
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Set theme value
+check_ckey=$(grep "PREF_UI_SORT" $USER_DATA/user.conf)
+if [ -z "$check_ckey" ]; then
+    # Rebuild user configuration to repair missing value
+    $BIN/v-rebuild-user $user
+fi
+update_user_value "$user" '$PREF_UI_SORT' "$sort_order"
+
+#----------------------------------------------------------#
+#                       Hestia                             #
+#----------------------------------------------------------#
+
+exit

bin/v-list-user

@@ -80,6 +80,7 @@ json_list() {
         "LANGUAGE": "'$LANGUAGE'",
         "THEME": "'$THEME'",
         "NOTIFICATIONS": "'$NOTIFICATIONS'",
+        "PREF_UI_SORT": "'$PREF_UI_SORT'",
         "PHPCLI": "'$PHPCLI'",
         "TIME": "'$TIME'",
         "DATE": "'$DATE'"

func/rebuild.sh

@@ -39,6 +39,9 @@ rebuild_user_conf() {
     if [ -z "${THEME+x}" ]; then 
         sed -i "/LANGUAGE/a THEME=''" $USER_DATA/user.conf 
     fi
+    if [ -z "${PREF_UI_SORT+x}" ]; then 
+        sed -i "/NOTIFICATIONS/a PREF_UI_SORT='name'" $USER_DATA/user.conf 
+    fi
     # Run template trigger
     if [ -x "$HESTIA/data/packages/$PACKAGE.sh" ]; then
         $HESTIA/data/packages/$PACKAGE.sh "$user" "$CONTACT" "$NAME"

func/syshealth.sh

@@ -95,7 +95,7 @@ function syshealth_update_user_config_format() {
     # USER CONFIGURATION
     # Create array of known keys in configuration file
     system="user"
-    known_keys=(NAME PACKAGE CONTACT CRON_REPORTS MD5 RKEY TWOFA QRCODE PHPCLI ROLE SUSPENDED SUSPENDED_USERS SUSPENDED_WEB SUSPENDED_DNS SUSPENDED_MAIL SUSPENDED_DB SUSPENDED_CRON IP_AVAIL IP_OWNED U_USERS U_DISK U_DISK_DIRS U_DISK_WEB U_DISK_MAIL U_DISK_DB U_BANDWIDTH U_WEB_DOMAINS U_WEB_SSL U_WEB_ALIASES U_DNS_DOMAINS U_DNS_RECORDS U_MAIL_DKIM U_MAIL_DKIM U_MAIL_ACCOUNTS U_MAIL_DOMAINS U_MAIL_SSL U_DATABASES U_CRON_JOBS U_BACKUPS LANGUAGE THEME NOTIFICATIONS TIME DATE)
+    known_keys=(NAME PACKAGE CONTACT CRON_REPORTS MD5 RKEY TWOFA QRCODE PHPCLI ROLE SUSPENDED SUSPENDED_USERS SUSPENDED_WEB SUSPENDED_DNS SUSPENDED_MAIL SUSPENDED_DB SUSPENDED_CRON IP_AVAIL IP_OWNED U_USERS U_DISK U_DISK_DIRS U_DISK_WEB U_DISK_MAIL U_DISK_DB U_BANDWIDTH U_WEB_DOMAINS U_WEB_SSL U_WEB_ALIASES U_DNS_DOMAINS U_DNS_RECORDS U_MAIL_DKIM U_MAIL_DKIM U_MAIL_ACCOUNTS U_MAIL_DOMAINS U_MAIL_SSL U_DATABASES U_CRON_JOBS U_BACKUPS LANGUAGE THEME NOTIFICATIONS PREF_UI_SORT TIME DATE)
     write_kv_config_file
     unset system
     unset known_keys

web/edit/user/index.php

@@ -46,6 +46,7 @@ $v_email = $data[$v_username]['CONTACT'];
 $v_package = $data[$v_username]['PACKAGE'];
 $v_language = $data[$v_username]['LANGUAGE'];
 $v_user_theme = $data[$v_username]['THEME'];
+$v_sort_order = $data[$v_username]['PREF_UI_SORT'];
 $v_name = $data[$v_username]['NAME'];
 $v_shell = $data[$v_username]['SHELL'];
 $v_twofa = $data[$v_username]['TWOFA'];
@@ -165,6 +166,15 @@ if (!empty($_POST['save'])) {
         $v_qrcode = '';
     }
 
+    // Change default sort order
+    if (($v_sort_order != $_POST['v_sort_order']) && (empty($_SESSION['error_msg']))) {
+        $v_sort_order = escapeshellarg($_POST['v_sort_order']);
+        exec (HESTIA_CMD."v-change-user-sort-order ".escapeshellarg($v_username)." ".$v_sort_order, $output, $return_var);
+        check_return_code($return_var,$output);
+        unset($output);
+    }
+
+
     // Change package (admin only)
     if (($v_package != $_POST['v_package']) && ($_SESSION['userContext'] === 'admin') && (empty($_SESSION['error_msg']))) {
         $v_package = escapeshellarg($_POST['v_package']);

web/templates/admin/edit_user.html

@@ -209,6 +209,19 @@
                                 </td>
                             </tr>
                             <?}?>
+                            <tr>
+                                <td class="vst-text input-label">
+                                    <?php print _('Default sort order');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_sort_order">
+                                        <option value='date'><?php print _('Date'); ?></option>
+                                        <option value='name' <?php if($data[$user]['PREF_UI_SORT'] !== 'date') echo 'selected' ?>><?php print _('Name'); ?></option>
+                                    </select>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print _('Package');?>

web/templates/admin/list_cron.html

@@ -13,14 +13,19 @@
           <? } ?> 
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <li entity="sort-name"><span class="name" id="default-sort"><?=_('Cron Job')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Command')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Command')?> <i class="fas fa-sort-alpha-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Command'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/admin/list_db.html

@@ -28,8 +28,8 @@
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
           <li entity="sort-charset"><span class="name"><?=_('Charset')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-name"><span class="name" id="default-sort"><?=_('Database')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Database')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-server"><span class="name"><?=_('Host')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-user"><span class="name"><?=_('Username')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
@@ -38,7 +38,12 @@
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Database')?> <i class="fas fa-sort-alpha-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Database'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/admin/list_dns.html

@@ -8,8 +8,8 @@
           <? } ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display: none;">
-          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-name"><span class="name" id="default-sort"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-expire" sort_as_int="1"><span class="name"><?=_('Expire')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-ip"><span class="name"><?=_('IP address')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-records"><span class="name"><?=_('Records')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
@@ -18,7 +18,12 @@
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-		            <?=_('sort by');?>: <span><b><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Domain'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/admin/list_dns_rec.html

@@ -10,9 +10,9 @@
           <? } ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-value"><span class="name"><?=_('IP or Value')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-record"><span class="name" id="default-sort"><?=_('Record')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-record"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Record')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-ttl" sort_as_int="1"><span class="name"><?=_('TTL')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-type"><span class="name"><?=_('Type')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
@@ -20,7 +20,12 @@
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-		            <?=_('sort by');?>: <span><b><?=_('Record')?> <i class="fas fa-sort-alpha-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Record'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/admin/list_firewall.html

@@ -9,7 +9,7 @@
           <?php endif; ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <li entity="sort-action"><span class="name"><?=_('Action')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up active"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-action"><span class="name" id="default-sort"><?=_('Action')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up active"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-protocol"><span class="name"><?=_('Protocol')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-port"><span class="name"><?=_('Port')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-ip" sort_as_int="1"><span class="name"><?=_('IP address')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>

web/templates/admin/list_mail.html

@@ -9,15 +9,20 @@
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
           <li entity="sort-accounts" sort_as_int="1"><span class="name"><?=_('Accounts')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-name"><span class="name" id="default-sort"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                    <?=_('sort by');?>: <span><b><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Domain'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/admin/list_mail_acc.html

@@ -14,8 +14,8 @@
           <? } ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-name"><span class="name" id="default-sort"><?=_('Account')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Account')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-quota" sort_as_int="1"><span class="name"><?=_('Quota')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
@@ -23,7 +23,12 @@
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                  <?=_('sort by');?>: <span><b><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Account'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">

web/templates/admin/list_services.html

@@ -19,11 +19,8 @@
           </div>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
-          <li entity="sort-cpu" sort_as_int="1"><span class="name"><?=_('CPU')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-memory" sort_as_int="1"><span class="name"><?=_('Memory')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-name"><span class="name" id="default-sort"><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-uptime" sort_as_int="1"><span class="name" id="default-sort"><?=_('Uptime')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>

web/templates/admin/list_user.html

@@ -12,15 +12,20 @@
       </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
           <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-name"><span class="name" id="default-sort"><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                  <?=_('sort by');?>: <span><b><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Domain'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                   <form action="/search/" method="get">

web/templates/admin/list_web.html

@@ -9,16 +9,21 @@
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
           <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'date') { echo 'default-sort'; }?>"><?=_('Date')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-          <li entity="sort-name"><span class="name" id="default-sort"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
+          <li entity="sort-name"><span class="name" id="<?php if ($panel[$user]['PREF_UI_SORT'] === 'name') { echo 'default-sort'; }?>"><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-ip" sort_as_int="1"><span class="name"><?=_('IP address')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
               <td class="sort-by" title="<?=_('Sort items');?>">
-                <?=_('sort by');?>: <span><b><?=_('Domain')?> <i class="fas fa-sort-alpha-down"></i></b></span>
+                <?=_('sort by');?>: <span>
+                  <b>
+                    <? if ($panel[$user]['PREF_UI_SORT'] === 'name') { $label = 'Domain'; } else { $label = 'Date'; } ?>
+                    <?=_($label)?><i class="fas fa-sort-alpha-down"></i>
+                  </b>
+                </span>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">