diff --git a/admin_customers.php b/admin_customers.php index b02dcb2c..e12c165c 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -34,7 +34,7 @@ if ($page == 'customers' && $userinfo['customers'] != '0') { try { $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') ->withPagination($customer_list_data['customer_list']['columns']); } catch (Exception $e) { diff --git a/lib/Froxlor/UI/Callbacks/ProgressBar.php b/lib/Froxlor/UI/Callbacks/ProgressBar.php index 9fa78028..164baa1c 100644 --- a/lib/Froxlor/UI/Callbacks/ProgressBar.php +++ b/lib/Froxlor/UI/Callbacks/ProgressBar.php @@ -33,9 +33,9 @@ class ProgressBar { $infotext = null; if (isset($attributes['fields']['webspace_used']) && isset($attributes['fields']['mailspace_used']) && isset($attributes['fields']['dbspace_used'])) { - $infotext = UI::getLng('panel.used') . ':
'; - $infotext .= 'web: ' . PhpHelper::sizeReadable($attributes['fields']['webspace_used'] * 1024, null, 'bi') . '
'; - $infotext .= 'mail: ' . PhpHelper::sizeReadable($attributes['fields']['mailspace_used'] * 1024, null, 'bi') . '
'; + $infotext = UI::getLng('panel.used') . ':' . PHP_EOL; + $infotext .= 'web: ' . PhpHelper::sizeReadable($attributes['fields']['webspace_used'] * 1024, null, 'bi') . PHP_EOL; + $infotext .= 'mail: ' . PhpHelper::sizeReadable($attributes['fields']['mailspace_used'] * 1024, null, 'bi') . PHP_EOL; $infotext .= 'mysql: ' . PhpHelper::sizeReadable($attributes['fields']['dbspace_used'] * 1024, null, 'bi'); } @@ -50,7 +50,7 @@ class ProgressBar */ 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')); } /**