Bladeren bron

preserve keys in array_reverse()

Serghey Rodin 13 jaren geleden
bovenliggende
commit
ee1fb98337

+ 2 - 2
bin/v-list-user-packages

@@ -19,7 +19,7 @@ source $VESTA/func/main.sh
 json_list_pkgs() {
     echo '{'
     fileds_count=$(echo "$fields" | wc -w)
-    for package in $(ls $VESTA/data/packages); do
+    for package in $(ls -t $VESTA/data/packages); do
         PACKAGE=${package/.pkg/}
         pkg_data=$(cat $VESTA/data/packages/$package)
         eval $pkg_data
@@ -51,7 +51,7 @@ json_list_pkgs() {
 
 # Shell fnction
 shell_list_pkgs() {
-    for package in $(ls $VESTA/data/packages); do
+    for package in $(ls -t $VESTA/data/packages); do
         PACKAGE=${package/.pkg/}
         pkg_descr=$(cat $VESTA/data/packages/$package)
         eval $pkg_descr

+ 1 - 1
web/list/backup/index.php

@@ -14,7 +14,7 @@ top_panel($user,$TAB);
 // Data
 exec (VESTA_CMD."v-list-user-backups $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
-$data = array_reverse($data);
+$data = array_reverse($data,true);
 unset($output);
 include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup.html');
 

+ 1 - 1
web/list/cron/index.php

@@ -15,7 +15,7 @@ top_panel($user,$TAB);
 // Data
 exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
-$data = array_reverse($data);
+$data = array_reverse($data,true);
 unset($output);
 
 if ($_SESSION['user'] == 'admin') {

+ 1 - 1
web/list/db/index.php

@@ -14,7 +14,7 @@ top_panel($user,$TAB);
 // Data
 exec (VESTA_CMD."v-list-databases $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
-$data = array_reverse($data);
+$data = array_reverse($data, true);
 unset($output);
 
 if ($_SESSION['user'] == 'admin') {

+ 2 - 2
web/list/dns/index.php

@@ -15,7 +15,7 @@ top_panel($user,$TAB);
 if (empty($_GET['domain'])){
     exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
+    $data = array_reverse($data, true);
     unset($output);
     if ($_SESSION['user'] == 'admin') {
         include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns.html');
@@ -25,7 +25,7 @@ if (empty($_GET['domain'])){
 } else {
     exec (VESTA_CMD."v-list-dns-domain-records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
+    $data = array_reverse($data, true);
     unset($output);
     if ($_SESSION['user'] == 'admin') {
         include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns_rec.html');

+ 1 - 1
web/list/ip/index.php

@@ -15,7 +15,7 @@ top_panel($user,$TAB);
 if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v-list-sys-ips json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
+    $data = array_reverse($data, true);
     unset($output);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_ip.html');
 }

+ 2 - 2
web/list/mail/index.php

@@ -15,7 +15,7 @@ top_panel($user,$TAB);
 if (empty($_GET['domain'])){
     exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
+    $data = array_reverse($data, true);
     unset($output);
     if ($_SESSION['user'] == 'admin') {
         include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail.html');
@@ -25,7 +25,7 @@ if (empty($_GET['domain'])){
 } else {
     exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".$_GET['domain']."' json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
+    $data = array_reverse($data, true);
     unset($output);
     if ($_SESSION['user'] == 'admin') {
         include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail_acc.html');

+ 1 - 1
web/list/package/index.php

@@ -15,7 +15,7 @@ top_panel($user,$TAB);
 if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v-list-user-packages json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
+    //$data = array_reverse($data, true);
     unset($output);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_packages.html');
 }

+ 3 - 3
web/list/stats/index.php

@@ -16,13 +16,13 @@ if ($user == 'admin') {
     if (empty($_GET['user'])) {
         exec (VESTA_CMD."v-list-users-stats json", $output, $return_var);
         $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
+        $data = array_reverse($data, true);
         unset($output);
     } else {
         $v_user = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v-list-user-stats $v_user json", $output, $return_var);
         $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
+        $data = array_reverse($data, true);
         unset($output);
     }
 
@@ -34,7 +34,7 @@ if ($user == 'admin') {
 } else {
     exec (VESTA_CMD."v-list-user-stats $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
+    $data = array_reverse($data, true);
     unset($output);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_stats.html');
 }

+ 2 - 2
web/list/user/index.php

@@ -17,13 +17,13 @@ if ($_SESSION['user'] == 'admin') {
     if ($user == 'admin') $cmd = "v-list-users json";
     exec (VESTA_CMD.$cmd, $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
+    $data = array_reverse($data,true);
     display_error_block();
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_user.html');
 } else {
     exec (VESTA_CMD."v-list-user ".$user." json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
+    //$data = array_reverse($data,true);
     display_error_block();
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_user.html');
 }

+ 1 - 1
web/list/web/index.php

@@ -14,7 +14,7 @@ top_panel($user,$TAB);
 // Data
 exec (VESTA_CMD."v-list-web-domains $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
-$data = array_reverse($data);
+$data = array_reverse($data,true);
 if ($_SESSION['user'] == 'admin') {
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_web.html');
 } else {