Merge pull request #2184 from serghey-rodin/feature/disk-percentage-values

Added disk and bandwidth percentage values to the session response.
This commit is contained in:
Alexander Osinskii 2021-11-22 23:45:44 +02:00 committed by GitHub
commit 5dc474846b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 3 deletions

View file

@ -7,6 +7,8 @@ $TAB = 'IP';
header('Content-Type: application/json');
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
// var_dump($_SESSION['user']);
// Check user
if ($_SESSION['user'] != 'admin') {
exit;

View file

@ -636,10 +636,9 @@ $result = array(
'mail_system' => $_SESSION['MAIL_SYSTEM'],
'antivirus_system' => $_SESSION['ANTIVIRUS_SYSTEM'],
'antispam_system' => $_SESSION['ANTISPAM_SYSTEM'],
'mail_url' => $_SESSION['MAIL_URL'],
'mail_url' => $_SESSION['DB_PMA_URL'],
'pgsql_url' => $_SESSION['DB_PGA_URL'],
'mail_certificate' => $_SESSION['MAIL_CERTIFICATE'],
'db_pma_url' => $_SESSION['DB_PMA_URL'],
'dns_system' => $_SESSION['DNS_SYSTEM'],
'web_system' => $_SESSION['WEB_SYSTEM'],
'softaculous' => $_SESSION['SOFTACULOUS'],
@ -667,7 +666,7 @@ $result = array(
'v_dns_cluster' => $v_dns_cluster,
'db_hosts' => $db_hosts,
'mysql_hosts' => $v_mysql_hosts,
'mysql' => $mysql,
'mysql' => $v_mysql,
'pgsql_hosts' => $v_pgsql_hosts,
'pgsql' => $v_pgsql,
'protocols' => [ __('ftp'), __('sftp') ],

View file

@ -25,6 +25,8 @@ list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
foreach ($data as $key => $value) {
++$i;
$data[$key]['U_DISK_PERCENT'] = get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']);
if ( $i == 1) {
$total_amount = __('1 database');
} else {

View file

@ -35,6 +35,12 @@ top_panel(empty($_SESSION['look']) ? $_SESSION['user'] : $_SESSION['look'], $TAB
foreach ($data as $key => $value) {
++$i;
if (empty($_GET['domain'])){
$data[$key]['U_DISK_PERCENT'] = get_percentage($data[$key]['U_DISK'], $data[$key]['QUOTA']);
} else {
$data[$key]['U_DISK_PERCENT'] = get_percentage($data[$key]['U_DISK'], $panel[$user]['DISK_QUOTA']);
}
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
$webmail = "/webmail/";
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];

View file

@ -35,6 +35,9 @@ if ($user == 'admin') {
foreach ($data as $key => $value) {
++$i;
$data[$key]['U_BANDWIDTH_PERCENT'] = get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']);
$data[$key]['U_DISK_PERCENT'] = get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']);
if ( $i == 1) {
$total_amount = __('1 month');
} else {

View file

@ -28,6 +28,9 @@ foreach ($data as $key => $value) {
$total_amount = __('%s accounts', $i);
}
$data[$key]['U_BANDWIDTH_PERCENT'] = get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']);
$data[$key]['U_DISK_PERCENT'] = get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']);
$data[$key]['U_BANDWIDTH'] = humanize_usage_size($data[$key]['U_BANDWIDTH']);
$data[$key]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($data[$key]['U_BANDWIDTH_MEASURE']);

View file

@ -23,6 +23,9 @@ $_SESSION['back'] = $_SERVER['REQUEST_URI'];
foreach ($data as $key => $value) {
++$i;
$data[$key]['U_BANDWIDTH_PERCENT'] = get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']);
$data[$key]['U_DISK_PERCENT'] = get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']);
if ($data[$key]['SUSPENDED'] == 'yes') {
$data[$key]['status'] = 'suspended';
$data[$key]['spnd_action'] = 'unsuspend' ;