From c308a42d2ffe040d27c3432de30a2a787c3d0692 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 6 Nov 2021 17:50:50 +0200 Subject: [PATCH] Added few auxiliary values from user session. Improved user, web and server api endpoints. --- web/api/v1/add/web/index.php | 2 +- web/api/v1/edit/server/index.php | 13 +++++++++++++ web/api/v1/list/db/index.php | 2 ++ web/api/v1/list/user/index.php | 18 ++++++++++++++++++ web/api/v1/list/web/index.php | 10 +--------- web/api/v1/login/index.php | 6 ++++++ 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/web/api/v1/add/web/index.php b/web/api/v1/add/web/index.php index a0036367f..8b76cafcf 100644 --- a/web/api/v1/add/web/index.php +++ b/web/api/v1/add/web/index.php @@ -361,7 +361,7 @@ unset($output); $result = array( 'prefix' => __('Prefix will be automaticaly added to username',$user."_"), - 'ftp_pre_path' => $v_ftp_user_prepath, + 'ftp_pre_path' => '', 'ftp_email' => $v_ftp_email, 'stats' => $stats, 'proxy_ext' => 'jpeg, jpg, png, gif, bmp, ico, svg, tif, tiff, css, js, htm, html, ttf, otf, webp, woff, txt, csv, rtf, doc, docx, xls, xlsx, ppt, pptx, odf, odp, ods, odt, pdf, psd, ai, eot, eps, ps, zip, tar, tgz, gz, rar, bz2, 7z, aac, m4a, mp3, mp4, ogg, wav, wma, 3gp, avi, flv, m4v, mkv, mov, mp4, mpeg, mpg, wmv, exe, iso, dmg, swf', diff --git a/web/api/v1/edit/server/index.php b/web/api/v1/edit/server/index.php index b9edd765e..76a005283 100644 --- a/web/api/v1/edit/server/index.php +++ b/web/api/v1/edit/server/index.php @@ -15,6 +15,9 @@ if ($_SESSION['user'] != 'admin') { // Get server hostname $v_hostname = exec('hostname'); +// Get server port +$port = $_SERVER['SERVER_PORT']; + // List available timezones and get current one $v_timezones = list_timezones(); exec (VESTA_CMD."v-get-sys-timezone", $output, $return_var); @@ -58,6 +61,7 @@ $v_pgsql = count($v_pgsql_hosts) ? 'yes' : 'no'; unset($db_hosts); // List backup settings +$v_backup_remote_adv="yes"; $v_backup_dir = "/backup"; if (!empty($_SESSION['BACKUP'])) $v_backup_dir = $_SESSION['BACKUP']; $v_backup_gzip = '5'; @@ -595,6 +599,14 @@ if (!empty($_POST['save'])) { } } + // Change port + if ((!empty($_POST['port'])) && ($port != $_POST['port'])) { + exec (VESTA_CMD."v-change-vesta-port ".escapeshellarg($_POST['port']), $output, $return_var); + check_return_code($return_var,$output); + unset($output); + $port = $_POST['port']; + } + } // Check system configuration @@ -615,6 +627,7 @@ $result = array( 'hostname' => $v_hostname, 'timezones' => $v_timezones, 'timezone' => $v_timezone, + 'port' => $port, 'languages' => $languages, 'backup_adv' => $v_backup_adv, 'backup_remote_adv' => $v_backup_remote_adv, diff --git a/web/api/v1/list/db/index.php b/web/api/v1/list/db/index.php index f9e327a2c..42c872958 100644 --- a/web/api/v1/list/db/index.php +++ b/web/api/v1/list/db/index.php @@ -72,6 +72,8 @@ $object->user = $user; $object->panel = $panel; $object->db_admin = $db_admin; $object->db_admin_link = $db_admin_link; +$object->db_myadmin_link = $db_myadmin_link; +$object->db_pgadmin_link = $db_pgadmin_link; $object->totalAmount = $total_amount; $object->databases = $databases; $object->dbFav = $_SESSION['favourites']['DB']; diff --git a/web/api/v1/list/user/index.php b/web/api/v1/list/user/index.php index eb202cd80..acacb3a21 100644 --- a/web/api/v1/list/user/index.php +++ b/web/api/v1/list/user/index.php @@ -27,6 +27,24 @@ foreach ($data as $key => $value) { } else { $total_amount = __('%s accounts', $i); } + + $data[$key]['U_BANDWIDTH'] = humanize_usage_size($data[$key]['U_BANDWIDTH']); + $data[$key]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($data[$key]['U_BANDWIDTH_MEASURE']); + + $data[$key]['U_DISK'] = humanize_usage_size($data[$key]['U_DISK']); + $data[$key]['U_DISK_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_MEASURE']); + + $data[$key]['U_DISK_WEB'] = humanize_usage_size($data[$key]['U_DISK_WEB']); + $data[$key]['U_DISK_WEB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_WEB_MEASURE']); + + $data[$key]['U_DISK_DB'] = humanize_usage_size($data[$key]['U_DISK_DB']); + $data[$key]['U_DISK_DB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DB_MEASURE']); + + $data[$key]['U_DISK_MAIL'] = humanize_usage_size($data[$key]['U_DISK_MAIL']); + $data[$key]['U_DISK_MAIL_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_MAIL_MEASURE']); + + $data[$key]['U_DISK_DIRS'] = humanize_usage_size($data[$key]['U_DISK_DIRS']); + $data[$key]['U_DISK_DIRS_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DIRS_MEASURE']); if ($data[$key]['SUSPENDED'] == 'yes') { $spnd_action = 'unsuspend' ; diff --git a/web/api/v1/list/web/index.php b/web/api/v1/list/web/index.php index 642d77e55..252de541a 100644 --- a/web/api/v1/list/web/index.php +++ b/web/api/v1/list/web/index.php @@ -48,15 +48,7 @@ foreach ($data as $key => $value) { $ftp_user=$data[$key]['FTP_USER']; } - if (strlen($ftp_user) > 24 ) { - $data[$key]['FTP_USER'] = str_replace(':', ', ', $ftp_user); - $data[$key]['FTP_USER'] = substr($ftp_user, 0, 24); - $data[$key]['FTP_USER'] = trim($ftp_user, ":"); - $data[$key]['FTP_USER'] = str_replace(':', ', ', $ftp_user); - $data[$key]['FTP_USER'] = $ftp_user.", ..."; - } else { - $data[$key]['FTP_USER'] = str_replace(':', ', ', $ftp_user); - } + $data[$key]['FTP_USER'] = str_replace(':', ', ', $ftp_user); if (strlen($data[$key]['PROXY_EXT']) > 24 ) { $data[$key]['PROXY_EXT'] = str_replace(',', ', ', $data[$key]['PROXY_EXT']); diff --git a/web/api/v1/login/index.php b/web/api/v1/login/index.php index 2524cfff7..114a1fd97 100644 --- a/web/api/v1/login/index.php +++ b/web/api/v1/login/index.php @@ -157,6 +157,12 @@ require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php' $v_user = empty($_SESSION['look']) ? $_SESSION['user'] : $_SESSION['look']; top_panel($v_user, $TAB); +$panel[$v_user]['U_BANDWIDTH'] = humanize_usage_size($panel[$v_user]['U_BANDWIDTH']); +$panel[$v_user]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_BANDWIDTH_MEASURE']); + +$panel[$v_user]['U_DISK'] = humanize_usage_size($panel[$v_user]['U_DISK']); +$panel[$v_user]['U_DISK_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_DISK_MEASURE']); + $result = array( 'token' => $_SESSION['token'], 'panel' => $panel,