maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix traffic display in dashboards

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-11-04 12:39:10 +01:00
parent 5abe663cbe
commit dbec714af8
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_index.php
View File

@@ -101,7 +101,7 @@ if ($page == 'overview') {
$userinfo['traffic_bytes'] = ($userinfo['traffic'] > -1) ? $userinfo['traffic'] * 1024 : -1; $userinfo['traffic_bytes'] = ($userinfo['traffic'] > -1) ? $userinfo['traffic'] * 1024 : -1;
$overview['traffic_bytes'] = $overview['traffic_assigned'] * 1024; $overview['traffic_bytes'] = $overview['traffic_assigned'] * 1024;
$overview['traffic_bytes_used'] = $overview['traffic_used'] * 1024; $overview['traffic_bytes_used'] = $overview['traffic_used'];
$number_domains_stmt = Database::prepare(" $number_domains_stmt = Database::prepare("
SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "` SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "`

2
customer_index.php
View File

@@ -109,7 +109,7 @@ if ($page == 'overview') {
// get everything in bytes for the percentage calculation on the dashboard // get everything in bytes for the percentage calculation on the dashboard
$userinfo['diskspace_bytes'] = ($userinfo['diskspace'] > -1) ? $userinfo['diskspace'] * 1024 : -1; $userinfo['diskspace_bytes'] = ($userinfo['diskspace'] > -1) ? $userinfo['diskspace'] * 1024 : -1;
$userinfo['traffic_bytes'] = ($userinfo['traffic'] > -1) ? $userinfo['traffic'] * 1024 : -1; $userinfo['traffic_bytes'] = ($userinfo['traffic'] > -1) ? $userinfo['traffic'] * 1024 : -1;
$userinfo['traffic_bytes_used'] = $userinfo['traffic_used'] * 1024; $userinfo['traffic_bytes_used'] = $userinfo['traffic_used'];
if ($usages) { if ($usages) {
$userinfo['diskspace_bytes_used'] = $usages['webspace'] * 1024; $userinfo['diskspace_bytes_used'] = $usages['webspace'] * 1024;

2
lib/Froxlor/UI/Callbacks/ProgressBar.php
View File

@@ -89,6 +89,6 @@ class ProgressBar
*/ */
public static function traffic(array $attributes): array public static function traffic(array $attributes): array
{ {
return self::pbData('traffic', $attributes['fields'], 1024, (int)Settings::Get('system.report_trafficmax')); return self::pbData('traffic', $attributes['fields'], 1, (int)Settings::Get('system.report_trafficmax'));
} }
} }

2
lib/formfields/admin/customer/formfield.customer_edit.php
View File

@@ -51,7 +51,7 @@ return [
'label' => lng('admin.stdsubdomain_add') . '?', 'label' => lng('admin.stdsubdomain_add') . '?',
'type' => 'checkbox', 'type' => 'checkbox',
'value' => '1', 'value' => '1',
'checked' => $result['standardsubdomain'] 'checked' => (bool)$result['standardsubdomain']
], ],
'deactivated' => [ 'deactivated' => [
'label' => lng('admin.deactivated_user'), 'label' => lng('admin.deactivated_user'),