preserve keys in array_reverse()

This commit is contained in:
Serghey Rodin 2013-02-20 14:37:07 +02:00
commit ee1fb98337
11 changed files with 17 additions and 17 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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