github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 05:44:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor array initialization to remove PHP version checks in web/edit/server/index.php

Browse source
This commit is contained in:
Peca 2025-08-10 23:26:20 +02:00
commit d944a44c7b
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
web/edit/server/index.php
View file

@ -36,13 +36,13 @@ if ($v_timezone == 'America/Halifax' ) $v_timezone = 'ADT';
// List supported languages // List supported languages
exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var);
$languages = json_decode(implode('', $output), true); $languages = json_decode(implode('', $output), true);
if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($languages)) { $languages = array(); } if (!is_array($languages)) $languages = array();
unset($output); unset($output);
// List dns cluster hosts // List dns cluster hosts
exec (VESTA_CMD."v-list-remote-dns-hosts json", $output, $return_var); exec (VESTA_CMD."v-list-remote-dns-hosts json", $output, $return_var);
$dns_cluster = json_decode(implode('', $output), true); $dns_cluster = json_decode(implode('', $output), true);
if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($dns_cluster)) { $dns_cluster = array(); } if (!is_array($dns_cluster)) $dns_cluster = array();
unset($output); unset($output);
foreach ($dns_cluster as $key => $value) { foreach ($dns_cluster as $key => $value) {
$v_dns_cluster = 'yes'; $v_dns_cluster = 'yes';
@ -51,12 +51,14 @@ foreach ($dns_cluster as $key => $value) {
// List Database hosts // List Database hosts
exec (VESTA_CMD."v-list-database-hosts json", $output, $return_var); exec (VESTA_CMD."v-list-database-hosts json", $output, $return_var);
$db_hosts = json_decode(implode('', $output), true); $db_hosts = json_decode(implode('', $output), true);
if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($db_hosts)) { $db_hosts = array(); } if (!is_array($db_hosts)) $db_hosts = array();
unset($output); unset($output);
$v_mysql_hosts = array_values(array_filter($db_hosts, function($host){return $host['TYPE'] === 'mysql';})); $v_mysql_hosts = array_values(array_filter($db_hosts, function($host){return $host['TYPE'] === 'mysql';}));
$v_mysql = (version_compare(PHP_VERSION, '5.6', '==') ? count($v_mysql_hosts) : (is_array($v_mysql_hosts) ? count($v_mysql_hosts) : 0)) ? 'yes' : 'no'; $v_mysql = 'no';
if (is_array($v_mysql_hosts) && count($v_mysql_hosts) > 0) $v_mysql = 'yes';
$v_pgsql_hosts = array_values(array_filter($db_hosts, function($host){return $host['TYPE'] === 'pgsql';})); $v_pgsql_hosts = array_values(array_filter($db_hosts, function($host){return $host['TYPE'] === 'pgsql';}));
$v_pgsql = (version_compare(PHP_VERSION, '5.6', '==') ? count($v_pgsql_hosts) : (is_array($v_pgsql_hosts) ? count($v_pgsql_hosts) : 0)) ? 'yes' : 'no'; $v_pgsql = 'no';
if (is_array($v_pgsql_hosts) && count($v_pgsql_hosts) > 0) $v_pgsql = 'yes';
unset($db_hosts); unset($db_hosts);
// List backup settings // List backup settings
@ -84,14 +86,14 @@ foreach ($backup_types as $backup_type) {
// List ssl web domains // List ssl web domains
exec (VESTA_CMD."v-search-ssl-certificates json", $output, $return_var); exec (VESTA_CMD."v-search-ssl-certificates json", $output, $return_var);
$v_ssl_domains = json_decode(implode('', $output), true); $v_ssl_domains = json_decode(implode('', $output), true);
if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($v_ssl_domains)) { $v_ssl_domains = array(); } if (!is_array($v_ssl_domains)) $v_ssl_domains = array();
//$v_vesta_certificate //$v_vesta_certificate
unset($output); unset($output);
// List ssl certificate info // List ssl certificate info
exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var); exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var);
$v_sys_ssl_str = json_decode(implode('', $output), true); $v_sys_ssl_str = json_decode(implode('', $output), true);
if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($v_sys_ssl_str)) { $v_sys_ssl_str = array('VESTA'=>array()); } if (!is_array($v_sys_ssl_str)) $v_sys_ssl_str = array('VESTA'=>array());
unset($output); unset($output);
$v_sys_ssl_crt = $v_sys_ssl_str['VESTA']['CRT']; $v_sys_ssl_crt = $v_sys_ssl_str['VESTA']['CRT'];
$v_sys_ssl_key = $v_sys_ssl_str['VESTA']['KEY']; $v_sys_ssl_key = $v_sys_ssl_str['VESTA']['KEY'];
@ -108,7 +110,7 @@ $v_sys_ssl_issuer = $v_sys_ssl_str['VESTA']['ISSUER'];
if (!empty($_SESSION['VESTA_CERTIFICATE'])); { if (!empty($_SESSION['VESTA_CERTIFICATE'])); {
exec (VESTA_CMD."v-list-sys-mail-ssl json", $output, $return_var); exec (VESTA_CMD."v-list-sys-mail-ssl json", $output, $return_var);
$v_mail_ssl_str = json_decode(implode('', $output), true); $v_mail_ssl_str = json_decode(implode('', $output), true);
if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($v_mail_ssl_str)) { $v_mail_ssl_str = array('MAIL'=>array()); } if (!is_array($v_mail_ssl_str)) $v_mail_ssl_str = array('MAIL'=>array());
unset($output); unset($output);
$v_mail_ssl_crt = $v_mail_ssl_str['MAIL']['CRT']; $v_mail_ssl_crt = $v_mail_ssl_str['MAIL']['CRT'];
$v_mail_ssl_key = $v_mail_ssl_str['MAIL']['KEY']; $v_mail_ssl_key = $v_mail_ssl_str['MAIL']['KEY'];
@ -248,7 +250,7 @@ if (!empty($_POST['save'])) {
// List SSL certificate info // List SSL certificate info
exec (VESTA_CMD."v-list-sys-mail-ssl json", $output, $return_var); exec (VESTA_CMD."v-list-sys-mail-ssl json", $output, $return_var);
$v_mail_ssl_str = json_decode(implode('', $output), true); $v_mail_ssl_str = json_decode(implode('', $output), true);
if (version_compare(PHP_VERSION, '5.6', '!=') && !is_array($v_mail_ssl_str)) { $v_mail_ssl_str = array('MAIL'=>array()); } if (!is_array($v_mail_ssl_str)) $v_mail_ssl_str = array('MAIL'=>array());
unset($output); unset($output);
$v_mail_ssl_crt = $v_mail_ssl_str['MAIL']['CRT']; $v_mail_ssl_crt = $v_mail_ssl_str['MAIL']['CRT'];
$v_mail_ssl_key = $v_mail_ssl_str['MAIL']['KEY']; $v_mail_ssl_key = $v_mail_ssl_str['MAIL']['KEY'];