Skip to content

Commit d600521

Browse files
author
Pascal Dreissen
committed
Dashboard limit dashlet bug since commit (3223915)
1 parent 3223915 commit d600521

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

interface/web/admin/lib/lang/nl_server_config.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,7 @@ $wb['nagios_password_txt'] = 'Nagios/Check_MK Password';
289289
$wb['nagios_url_error_regex'] = 'Invalid Nagios/Check_MK URL';
290290
$wb['nagios_url_note_txt'] = 'Check_MK is being autodetected. Placeholder:';
291291
$wb['mailinglist_manager_txt'] = 'Mailinglist Manager';
292+
$wb['backup_tmp_txt'] = 'Backup tijdelijke map voor zip';
293+
$wb['tmpdir_path_error_empty'] = 'tmp-dir map is leeg.';
294+
$wb['tmpdir_path_error_regex'] = 'Ongeldige tmp-dir map.';
292295
?>

interface/web/dashboard/dashlets/limits.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,11 @@ function show() {
165165
}
166166
else $usage = $this->_get_limit_usage($limit);
167167
$percentage = ($value == '-1' || $value == 0 ? 0 : round(100 * $usage / $value));
168-
$progressbar = $percentage > 100 ? 100 : $percentage;
169-
168+
if($value == $wb['unlimited_txt'] || $value == '-1') {
169+
$progressbar = '-1';
170+
} else {
171+
$progressbar = $percentage > 100 ? 100 : $percentage;
172+
}
170173
$rows[] = array('field' => $field,
171174
'field_txt' => $wb[$field.'_txt'],
172175
'value' => $value_formatted,

interface/web/dashboard/lib/lang/nl_dashlet_limits.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Aantal klanten';
2828
$wb['limit_database_txt'] = 'Aantal databases';
2929
$wb['limit_mailmailinglist_txt'] = 'Aantal mailing lijsten';
3030
$wb['limit_domain_txt'] = 'Aantal domeinen';
31+
$wb['limit_mailquota_txt'] = 'Toegewezen mailbox quota';
32+
$wb['limit_web_quota_txt'] = 'Toegewezen webquota';
33+
$wb['limit_database_quota_txt'] = 'Toegewezen databasequota';
3134
?>

0 commit comments

Comments
 (0)