diff --git a/web/inc/i18n.php b/web/inc/i18n.php index 5a41c54a..48cdf63d 100644 --- a/web/inc/i18n.php +++ b/web/inc/i18n.php @@ -89,11 +89,7 @@ function detect_user_language($fallback='en') { $accept_langs_sorted[$code] = (double)$q; } } - if (version_compare(PHP_VERSION, '5.6', '==')) { - arsort($accept_langs_sorted); - } else { - if (!empty($accept_langs_sorted)) { arsort($accept_langs_sorted); } - } + if (!empty($accept_langs_sorted)) arsort($accept_langs_sorted); // List languages exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); diff --git a/web/inc/main.php b/web/inc/main.php index 8a969cb9..86913dd5 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -108,14 +108,8 @@ if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) { function get_favourites(){ exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var); -// $data = json_decode(implode('', $output).'}', true); - if (version_compare(PHP_VERSION, '5.6', '==')) { - $data = json_decode(implode('', $output), true); - $data = array_reverse($data, true); - } else { - $data = json_decode(implode('', $output), true); - $data = is_array($data) ? array_reverse($data, true) : array(); - } + $data = json_decode(implode('', $output), true); + $data = is_array($data) ? array_reverse($data, true) : array(); $favourites = array(); foreach($data['Favourites'] as $key => $favourite){ @@ -193,24 +187,16 @@ function top_panel($user, $TAB) { header("Location: /error/"); exit; } - if (version_compare(PHP_VERSION, '5.6', '==')) { - $panel = json_decode(implode('', $output), true); - } else { - $panel = json_decode(implode('', $output), true); - if (!is_array($panel)) { $panel = array(); } - } + $panel = json_decode(implode('', $output), true); + if (!is_array($panel)) $panel = array(); unset($output); // getting notifications $command = VESTA_CMD."v-list-user-notifications '".$user."' 'json'"; exec ($command, $output, $return_var); - if (version_compare(PHP_VERSION, '5.6', '==')) { - $notifications = json_decode(implode('', $output), true); - } else { - $notifications = json_decode(implode('', $output), true); - if (!is_array($notifications)) { $notifications = array(); } - } + $notifications = json_decode(implode('', $output), true); + if (!is_array($notifications)) $notifications = array(); foreach($notifications as $message){ if(isset($message['ACK']) && $message['ACK'] == 'no'){ $panel[$user]['NOTIFICATIONS'] = 'yes'; @@ -229,14 +215,10 @@ function top_panel($user, $TAB) { function translate_date($date){ $date = strtotime($date); - if (version_compare(PHP_VERSION, '5.6', '==')) { - return strftime("%d ", $date).__(strftime("%b", $date)).strftime(" %Y", $date); - } else { - $day = date('d', $date); - $mon = date('M', $date); - $year = date('Y', $date); - return $day.' '.__($mon).' '.$year; - } + $day = date('d', $date); + $mon = date('M', $date); + $year = date('Y', $date); + return $day.' '.__($mon).' '.$year; } function humanize_time($usage) { diff --git a/web/list/backup/index.php b/web/list/backup/index.php index 28460a70..c32324e9 100644 --- a/web/list/backup/index.php +++ b/web/list/backup/index.php @@ -9,14 +9,14 @@ include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php'); if (empty($_GET['backup'])){ exec (VESTA_CMD."v-list-user-backups $user json", $output, $return_var); $data = json_decode(implode('', $output), true); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data,true); } else { $data = is_array($data) ? array_reverse($data,true) : array(); } + $data = is_array($data) ? array_reverse($data,true) : array(); unset($output); render_page($user, $TAB, 'list_backup'); } else { exec (VESTA_CMD."v-list-user-backup $user ".escapeshellarg($_GET['backup'])." json", $output, $return_var); $data = json_decode(implode('', $output), true); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data,true); } else { $data = is_array($data) ? array_reverse($data,true) : array(); } + $data = is_array($data) ? array_reverse($data,true) : array(); unset($output); render_page($user, $TAB, 'list_backup_detail'); diff --git a/web/list/cron/index.php b/web/list/cron/index.php index 0014be84..dc1e1121 100644 --- a/web/list/cron/index.php +++ b/web/list/cron/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php'); // Data exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data,true); } else { $data = is_array($data) ? array_reverse($data,true) : array(); } +$data = is_array($data) ? array_reverse($data,true) : array(); unset($output); // Render page diff --git a/web/list/db/index.php b/web/list/db/index.php index 0a2560ef..e2610e0f 100644 --- a/web/list/db/index.php +++ b/web/list/db/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Data exec (VESTA_CMD."v-list-databases $user json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } +$data = is_array($data) ? array_reverse($data, true) : array(); unset($output); // Render page diff --git a/web/list/directory/index.php b/web/list/directory/index.php index 0b845f00..ef5defeb 100644 --- a/web/list/directory/index.php +++ b/web/list/directory/index.php @@ -22,7 +22,7 @@ if (empty($panel)) { exit; } $panel = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($panel)) { $panel = array(); } + if (!is_array($panel)) $panel = array(); } $path_a = !empty($_REQUEST['dir_a']) ? htmlentities($_REQUEST['dir_a']) : ''; diff --git a/web/list/dns/index.php b/web/list/dns/index.php index 8da98594..ec47d8c2 100644 --- a/web/list/dns/index.php +++ b/web/list/dns/index.php @@ -9,14 +9,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (empty($_GET['domain'])){ exec (VESTA_CMD."v-list-dns-domains ".escapeshellarg($user)." json", $output, $return_var); $data = json_decode(implode('', $output), true); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } + $data = is_array($data) ? array_reverse($data, true) : array(); unset($output); render_page($user, $TAB, 'list_dns'); } else { exec (VESTA_CMD."v-list-dns-records ".escapeshellarg($user)." ".escapeshellarg($_GET['domain'])." json", $output, $return_var); $data = json_decode(implode('', $output), true); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } + $data = is_array($data) ? array_reverse($data, true) : array(); unset($output); render_page($user, $TAB, 'list_dns_rec'); diff --git a/web/list/firewall/banlist/index.php b/web/list/firewall/banlist/index.php index b03a419d..e278defb 100644 --- a/web/list/firewall/banlist/index.php +++ b/web/list/firewall/banlist/index.php @@ -14,7 +14,7 @@ if ($_SESSION['user'] != 'admin') { // Data exec (VESTA_CMD."v-list-firewall-ban json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } +$data = is_array($data) ? array_reverse($data, true) : array(); unset($output); // Render page diff --git a/web/list/ip/index.php b/web/list/ip/index.php index deae8059..94972a7b 100644 --- a/web/list/ip/index.php +++ b/web/list/ip/index.php @@ -15,7 +15,7 @@ if ($_SESSION['user'] != 'admin') { // Data exec (VESTA_CMD."v-list-sys-ips json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } +$data = is_array($data) ? array_reverse($data, true) : array(); unset($output); // Render page diff --git a/web/list/mail/index.php b/web/list/mail/index.php index 0295d9d8..f5e2fa3a 100644 --- a/web/list/mail/index.php +++ b/web/list/mail/index.php @@ -9,14 +9,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (empty($_GET['domain'])){ exec (VESTA_CMD."v-list-mail-domains ".escapeshellarg($user)." json", $output, $return_var); $data = json_decode(implode('', $output), true); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } + $data = is_array($data) ? array_reverse($data, true) : array(); unset($output); render_page($user, $TAB, 'list_mail'); } else { exec (VESTA_CMD."v-list-mail-accounts ".escapeshellarg($user)." ".escapeshellarg($_GET['domain'])." json", $output, $return_var); $data = json_decode(implode('', $output), true); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } + $data = is_array($data) ? array_reverse($data, true) : array(); unset($output); render_page($user, $TAB, 'list_mail_acc'); diff --git a/web/list/notifications/index.php b/web/list/notifications/index.php index 5b776a72..adfcf118 100644 --- a/web/list/notifications/index.php +++ b/web/list/notifications/index.php @@ -9,7 +9,7 @@ if($_REQUEST['ajax'] == 1){ // Data exec (VESTA_CMD."v-list-user-notifications $user json", $output, $return_var); $data = json_decode(implode('', $output), true); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data,true); } else { $data = is_array($data) ? array_reverse($data,true) : array(); } + $data = is_array($data) ? array_reverse($data,true) : array(); foreach($data as $key => $note){ $note['ID'] = $key; $data[$key] = $note; @@ -25,7 +25,7 @@ $TAB = 'NOTIFICATIONS'; // Data exec (VESTA_CMD."v-list-user-notifications $user json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data,true); } else { $data = is_array($data) ? array_reverse($data,true) : array(); } +$data = is_array($data) ? array_reverse($data,true) : array(); // Render page render_page($user, $TAB, 'list_notifications'); diff --git a/web/list/package/index.php b/web/list/package/index.php index 8bf029ab..3feb622d 100644 --- a/web/list/package/index.php +++ b/web/list/package/index.php @@ -15,7 +15,7 @@ if ($_SESSION['user'] != 'admin') { // Data exec (VESTA_CMD."v-list-user-packages json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($data)) { $data = array(); } +if (!is_array($data)) $data = array(); unset($output); // Render page diff --git a/web/list/rrd/index.php b/web/list/rrd/index.php index fd79e64f..81fde136 100644 --- a/web/list/rrd/index.php +++ b/web/list/rrd/index.php @@ -18,7 +18,7 @@ if (!empty($_GET['period'])) { // Data exec (VESTA_CMD."v-list-sys-rrd json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($data)) { $data = array(); } +if (!is_array($data)) $data = array(); unset($output); // Render page diff --git a/web/list/server/index.php b/web/list/server/index.php index cda1fca9..15cd306f 100644 --- a/web/list/server/index.php +++ b/web/list/server/index.php @@ -116,11 +116,11 @@ if (isset($_GET['db'])) { // Data exec (VESTA_CMD."v-list-sys-info json", $output, $return_var); $sys = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($sys)) { $sys = array(); } +if (!is_array($sys)) $sys = array(); unset($output); exec (VESTA_CMD."v-list-sys-services json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($data)) { $data = array(); } +if (!is_array($data)) $data = array(); unset($output); // Render page diff --git a/web/list/stats/index.php b/web/list/stats/index.php index 4db65f9b..b9b19ded 100644 --- a/web/list/stats/index.php +++ b/web/list/stats/index.php @@ -10,13 +10,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); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } + $data = is_array($data) ? array_reverse($data, true) : array(); 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); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } + $data = is_array($data) ? array_reverse($data, true) : array(); unset($output); } @@ -26,7 +26,7 @@ if ($user == 'admin') { } else { exec (VESTA_CMD."v-list-user-stats $user json", $output, $return_var); $data = json_decode(implode('', $output), true); - if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data, true); } else { $data = is_array($data) ? array_reverse($data, true) : array(); } + $data = is_array($data) ? array_reverse($data, true) : array(); unset($output); } diff --git a/web/list/updates/index.php b/web/list/updates/index.php index e27f4138..3b346fc1 100644 --- a/web/list/updates/index.php +++ b/web/list/updates/index.php @@ -14,7 +14,7 @@ if ($_SESSION['user'] != 'admin') { // Data exec (VESTA_CMD."v-list-sys-vesta-updates json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($data)) { $data = array(); } +if (!is_array($data)) $data = array(); unset($output); exec (VESTA_CMD."v-list-sys-vesta-autoupdate plain", $output, $return_var); $autoupdate = $output['0']; diff --git a/web/list/user/index.php b/web/list/user/index.php index 93a56ee1..398b7993 100644 --- a/web/list/user/index.php +++ b/web/list/user/index.php @@ -12,7 +12,7 @@ if ($user == 'admin') { exec (VESTA_CMD . "v-list-user ".$user." json", $output, $return_var); } $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data,true); } else { $data = is_array($data) ? array_reverse($data,true) : array(); } +$data = is_array($data) ? array_reverse($data,true) : array(); // Check and get changelog if needed if ($user == 'admin') { diff --git a/web/list/web/index.php b/web/list/web/index.php index 11b187dc..39985128 100644 --- a/web/list/web/index.php +++ b/web/list/web/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Data exec (VESTA_CMD."v-list-web-domains $user json", $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '==')) { $data = array_reverse($data,true); } else { $data = is_array($data) ? array_reverse($data,true) : array(); } +$data = is_array($data) ? array_reverse($data,true) : array(); $ips = json_decode(shell_exec(VESTA_CMD.'v-list-sys-ips json'), true); // Render page diff --git a/web/login/index.php b/web/login/index.php index f508c845..7ff68291 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -27,12 +27,8 @@ if (isset($_SESSION['user'])) { if ($_SESSION['user'] == 'admin' && !empty($_GET['loginas'])) { exec (VESTA_CMD . "v-list-user ".escapeshellarg($_GET['loginas'])." json", $output, $return_var); if ( $return_var == 0 ) { - if (version_compare(PHP_VERSION, '5.6', '==')) { - $data = json_decode(implode('', $output), true); - } else { - $data = json_decode(implode('', $output), true); - if (!is_array($data)) { $data = array(); } - } + $data = json_decode(implode('', $output), true); + if (!is_array($data)) { $data = array(); } reset($data); $_SESSION['look'] = key($data); $_SESSION['look_alert'] = 'yes'; @@ -56,12 +52,8 @@ if (isset($_POST['user']) && isset($_POST['password'])) { // Get user's salt $output = ''; exec (VESTA_CMD."v-get-user-salt ".$v_user." ".$v_ip." json" , $output, $return_var); - if (version_compare(PHP_VERSION, '5.6', '==')) { - $pam = json_decode(implode('', $output), true); - } else { - $pam = json_decode(implode('', $output), true); - if (!is_array($pam)) { $pam = array(); } - } + $pam = json_decode(implode('', $output), true); + if (!is_array($pam)) $pam = array(); if ( $return_var > 0 ) { $ERROR = "".__('Invalid username or password').""; } else { @@ -104,12 +96,8 @@ if (isset($_POST['user']) && isset($_POST['password'])) { // Get user speciefic parameters exec (VESTA_CMD . "v-list-user ".$v_user." json", $output, $return_var); - if (version_compare(PHP_VERSION, '5.6', '==')) { - $data = json_decode(implode('', $output), true); - } else { - $data = json_decode(implode('', $output), true); - if (!is_array($data)) { $data = array(); } - } + $data = json_decode(implode('', $output), true); + if (!is_array($data)) $data = array(); // Define session user $_SESSION['user'] = key($data); @@ -121,12 +109,8 @@ if (isset($_POST['user']) && isset($_POST['password'])) { // Define language $output = ''; exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); - if (version_compare(PHP_VERSION, '5.6', '==')) { - $languages = json_decode(implode('', $output), true); - } else { - $languages = json_decode(implode('', $output), true); - if (!is_array($languages)) { $languages = array(); } - } + $languages = json_decode(implode('', $output), true); + if (!is_array($languages)) $languages = array(); if (in_array($data[$v_user]['LANGUAGE'], $languages)){ $_SESSION['language'] = $data[$v_user]['LANGUAGE']; } else { @@ -155,12 +139,8 @@ if (isset($_POST['user']) && isset($_POST['password'])) { // Check system configuration exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var); -if (version_compare(PHP_VERSION, '5.6', '==')) { - $data = json_decode(implode('', $output), true); -} else { - $data = json_decode(implode('', $output), true); - if (!is_array($data)) { $data = array('config' => array()); } -} +$data = json_decode(implode('', $output), true); +if (!is_array($data)) $data = array('config' => array()); $sys_arr = $data['config']; foreach ($sys_arr as $key => $value) { $_SESSION[$key] = $value; @@ -170,22 +150,14 @@ foreach ($sys_arr as $key => $value) { if (empty($_SESSION['language'])) { $output = ''; exec (VESTA_CMD."v-list-sys-config json", $output, $return_var); - if (version_compare(PHP_VERSION, '5.6', '==')) { - $config = json_decode(implode('', $output), true); - } else { - $config = json_decode(implode('', $output), true); - if (!is_array($config)) { $config = array('config' => array('LANGUAGE' => 'en')); } - } + $config = json_decode(implode('', $output), true); + if (!is_array($config)) $config = array('config' => array('LANGUAGE' => 'en')); $lang = $config['config']['LANGUAGE']; $output = ''; exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); - if (version_compare(PHP_VERSION, '5.6', '==')) { - $languages = json_decode(implode('', $output), true); - } else { - $languages = json_decode(implode('', $output), true); - if (!is_array($languages)) { $languages = array(); } - } + $languages = json_decode(implode('', $output), true); + if (!is_array($languages)) $languages = array(); if(in_array($lang, $languages)){ $_SESSION['language'] = $lang; } diff --git a/web/reset/index.php b/web/reset/index.php index 816d3155..4094815b 100644 --- a/web/reset/index.php +++ b/web/reset/index.php @@ -24,12 +24,8 @@ if ((!empty($_POST['user'])) && (empty($_POST['code']))) { $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-list-user"; exec ($cmd." ".$v_user." json", $output, $return_var); if ( $return_var == 0 ) { - if (version_compare(PHP_VERSION, '5.6', '==')) { - $data = json_decode(implode('', $output), true); - } else { - $data = json_decode(implode('', $output), true); - if (!is_array($data)) { $data = array(); } - } + $data = json_decode(implode('', $output), true); + if (!is_array($data)) { $data = array(); } unset($output); exec("/usr/bin/sudo /usr/local/vesta/bin/v-get-user-value ".$v_user." RKEYEXP", $output, $return_var); $rkeyexp = trim(implode('', $output)); @@ -89,12 +85,8 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-list-user"; exec ($cmd." ".$v_user." json", $output, $return_var); if ( $return_var == 0 ) { - if (version_compare(PHP_VERSION, '5.6', '==')) { - $data = json_decode(implode('', $output), true); - } else { - $data = json_decode(implode('', $output), true); - if (!is_array($data)) { $data = array(); } - } + $data = json_decode(implode('', $output), true); + if (!is_array($data)) { $data = array(); } unset($output); $rkey = $data[$user]['RKEY']; if (hash_equals($rkey, $_POST['code'])) { diff --git a/web/search/index.php b/web/search/index.php index 2b7f5c97..022de39f 100644 --- a/web/search/index.php +++ b/web/search/index.php @@ -28,7 +28,7 @@ $command = $_SESSION['user'] == 'admin' exec (VESTA_CMD . $command, $output, $return_var); $data = json_decode(implode('', $output), true); -if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($data)) { $data = array(); } +if (!is_array($data)) $data = array(); // Render page render_page($user, $TAB, 'list_search'); diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 7db3be5a..910da764 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -253,7 +253,7 @@