Merge remote-tracking branch 'jaapmarcus/fix/auto-sort' into feature/user-roles

Author: Kristan Kenney

web/js/init.js

@@ -129,10 +129,6 @@ $(document).ready(function(){
                   return $(a).attr(VE.tmp.sort_par) <= $(b).attr(VE.tmp.sort_par) ? VE.tmp.sort_direction : VE.tmp.sort_direction * -1;
                 }).appendTo(".l-center.units");
               });
-              if(document.getElementById('default-sort')){
-                  document.getElementById('default-sort').click();
-                  $('.context-menu.sort-order').toggle();
-              };
 
               $('#objects').submit( function (e){
                  if(!e.originalEvent){

web/list/backup/index.php

@@ -9,7 +9,11 @@
 if (empty($_GET['backup'])){
     exec (HESTIA_CMD."v-list-user-backups $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data,true);
+    if($_SESSION['userSortOrder'] == 'name'){
+        ksort($data);
+    }else{ 
+        $data = array_reverse($data,true);
+    }
     unset($output);
 
     render_page($user, $TAB, 'list_backup');

web/list/cron/index.php

@@ -8,7 +8,11 @@
 // Data
 exec (HESTIA_CMD."v-list-cron-jobs $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
-$data = array_reverse($data,true);
+if($_SESSION['userSortOrder'] == 'name'){
+    ksort($data);
+}else{ 
+    $data = array_reverse($data,true);
+};
 unset($output);
 
 // Render page

web/list/db/index.php

@@ -8,7 +8,11 @@
 // Data
 exec (HESTIA_CMD."v-list-databases $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
-$data = array_reverse($data, true);
+if($_SESSION['userSortOrder'] == 'name'){
+    ksort($data);
+}else{ 
+    $data = array_reverse($data,true);
+}
 unset($output);
 
 // Render page

web/list/dns/index.php

@@ -9,14 +9,22 @@
 if (empty($_GET['domain'])){
     exec (HESTIA_CMD."v-list-dns-domains ".escapeshellarg($user)." 'json'", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data, true);
+    if($_SESSION['userSortOrder'] == 'name'){
+        ksort($data);
+    }else{ 
+        $data = array_reverse($data,true);
+    }
     unset($output);
 
     render_page($user, $TAB, 'list_dns');
 } else {
     exec (HESTIA_CMD."v-list-dns-records ".escapeshellarg($user)." ".escapeshellarg($_GET['domain'])." 'json'", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data, true);
+    if($_SESSION['userSortOrder'] == 'name'){
+        ksort($data);
+    }else{ 
+        $data = array_reverse($data,true);
+    }
     unset($output);
 
     render_page($user, $TAB, 'list_dns_rec');

web/list/firewall/index.php

@@ -14,7 +14,11 @@
 // Data
 exec (HESTIA_CMD."v-list-firewall json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
-$data = array_reverse($data, true);
+if($_SESSION['userSortOrder'] == 'name'){
+    ksort($data);
+}else{ 
+    $data = array_reverse($data,true);
+}
 unset($output);
 
 // Render page

web/list/ip/index.php

@@ -15,7 +15,11 @@
 // Data
 exec (HESTIA_CMD."v-list-sys-ips json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
-$data = array_reverse($data, true);
+if($_SESSION['userSortOrder'] == 'name'){
+    ksort($data);
+}else{ 
+    $data = array_reverse($data,true);
+}
 unset($output);
 
 // Render page

web/list/mail/index.php

@@ -9,7 +9,11 @@
 if (empty($_GET['domain'])){
     exec (HESTIA_CMD."v-list-mail-domains $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data, true);
+    if($_SESSION['userSortOrder'] == 'name'){
+        ksort($data);
+    }else{ 
+        $data = array_reverse($data,true);
+    }
     unset($output);
 
     render_page($user, $TAB, 'list_mail');
@@ -31,7 +35,11 @@
 } else {
     exec (HESTIA_CMD."v-list-mail-accounts ".escapeshellarg($user)." ".escapeshellarg($_GET['domain'])." json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data, true);
+    if($_SESSION['userSortOrder'] == 'name'){
+        ksort($data);
+    }else{ 
+        $data = array_reverse($data,true);
+    }
     unset($output);
 
     render_page($user, $TAB, 'list_mail_acc');

web/list/package/index.php

@@ -15,6 +15,11 @@
 // Data
 exec (HESTIA_CMD."v-list-user-packages json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
+if($_SESSION['userSortOrder'] == 'name'){
+    ksort($data);
+}else{ 
+    $data = array_reverse($data,true);
+}
 unset($output);
 
 // Render page

web/list/server/index.php

@@ -122,6 +122,10 @@
 unset($output);
 exec (HESTIA_CMD."v-list-sys-services json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
+if($_SESSION['userSortOrder'] == 'name'){
+    ksort($data);
+}
+
 unset($output);
 
 // Render page