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

fix usage info

Browse Source
This commit is contained in:
envoyr
2022-02-28 09:01:29 +01:00
parent fb9dccc94a
commit 2b771b11d6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_customers.php
View File

@@ -34,7 +34,7 @@ if ($page == 'customers' && $userinfo['customers'] != '0') {
try { try {
$customer_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.customers.php'; $customer_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.customers.php';
$collection = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Customers::class, $userinfo)) $collection = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Customers::class, $userinfo, ['show_usages' => true]))
->has('admin', \Froxlor\Api\Commands\Admins::class, 'adminid', 'adminid') ->has('admin', \Froxlor\Api\Commands\Admins::class, 'adminid', 'adminid')
->withPagination($customer_list_data['customer_list']['columns']); ->withPagination($customer_list_data['customer_list']['columns']);
} catch (Exception $e) { } catch (Exception $e) {

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

@@ -33,9 +33,9 @@ class ProgressBar
{ {
$infotext = null; $infotext = null;
if (isset($attributes['fields']['webspace_used']) && isset($attributes['fields']['mailspace_used']) && isset($attributes['fields']['dbspace_used'])) { if (isset($attributes['fields']['webspace_used']) && isset($attributes['fields']['mailspace_used']) && isset($attributes['fields']['dbspace_used'])) {
$infotext = UI::getLng('panel.used') . ':<br>'; $infotext = UI::getLng('panel.used') . ':' . PHP_EOL;
$infotext .= 'web: ' . PhpHelper::sizeReadable($attributes['fields']['webspace_used'] * 1024, null, 'bi') . '<br>'; $infotext .= 'web: ' . PhpHelper::sizeReadable($attributes['fields']['webspace_used'] * 1024, null, 'bi') . PHP_EOL;
$infotext .= 'mail: ' . PhpHelper::sizeReadable($attributes['fields']['mailspace_used'] * 1024, null, 'bi') . '<br>'; $infotext .= 'mail: ' . PhpHelper::sizeReadable($attributes['fields']['mailspace_used'] * 1024, null, 'bi') . PHP_EOL;
$infotext .= 'mysql: ' . PhpHelper::sizeReadable($attributes['fields']['dbspace_used'] * 1024, null, 'bi'); $infotext .= 'mysql: ' . PhpHelper::sizeReadable($attributes['fields']['dbspace_used'] * 1024, null, 'bi');
} }
@@ -50,7 +50,7 @@ class ProgressBar
*/ */
public static function traffic(array $attributes): array public static function traffic(array $attributes): array
{ {
return self::pbData('traffic', $attributes['fields'], 1024 * 1024, (int)Settings::Get('system.report_trafficmax')); return self::pbData('traffic', $attributes['fields'], 1024, (int)Settings::Get('system.report_trafficmax'));
} }
/** /**