Skip to content

Commit

Permalink
preserve keys in array_reverse()
Browse files Browse the repository at this point in the history
  • Loading branch information
@serghey-rodin
serghey-rodin committed Feb 20, 2013
1 parent 32e2b0a commit ee1fb98
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions bin/v-list-user-packages
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion web/list/backup/index.php
View file
Expand Up @@ -14,7 +14,7 @@
// 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');

Expand Down
2 changes: 1 addition & 1 deletion web/list/cron/index.php
View file
Expand Up @@ -15,7 +15,7 @@
// 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') {
Expand Down
2 changes: 1 addition & 1 deletion web/list/db/index.php
View file
Expand Up @@ -14,7 +14,7 @@
// 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') {
Expand Down
4 changes: 2 additions & 2 deletions web/list/dns/index.php
View file
Expand Up @@ -15,7 +15,7 @@
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');
Expand All @@ -25,7 +25,7 @@
} 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');
Expand Down
2 changes: 1 addition & 1 deletion web/list/ip/index.php
View file
Expand Up @@ -15,7 +15,7 @@
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');
}
Expand Down
4 changes: 2 additions & 2 deletions web/list/mail/index.php
View file
Expand Up @@ -15,7 +15,7 @@
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');
Expand All @@ -25,7 +25,7 @@
} 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');
Expand Down
2 changes: 1 addition & 1 deletion web/list/package/index.php
View file
Expand Up @@ -15,7 +15,7 @@
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');
}
Expand Down
6 changes: 3 additions & 3 deletions web/list/stats/index.php
View file
Expand Up @@ -16,13 +16,13 @@
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);
}

Expand All @@ -34,7 +34,7 @@
} 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');
}
Expand Down
4 changes: 2 additions & 2 deletions web/list/user/index.php
View file
Expand Up @@ -17,13 +17,13 @@
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');
}
Expand Down
2 changes: 1 addition & 1 deletion web/list/web/index.php
View file
Expand Up @@ -14,7 +14,7 @@
// 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 {
Expand Down

0 comments on commit ee1fb98

Please sign in to comment.