Skip to content

Commit 5c43e65

Browse files
author
Pascal Dreissen
committed
Merge branch 'master' into 'applemooz_master'
Master See merge request pdreissen/ispconfig3!36
2 parents 1efafdd + 27b8b93 commit 5c43e65

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+343
-188
lines changed

‎interface/lib/classes/functions.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public function intval($string, $force_numeric = false) {
282282
*/
283283
public function formatBytes($size, $precision = 2) {
284284
$suffixes=array('', ' kB', ' MB', ' GB', ' TB');
285-
if($size != 0 || is_nan($size)) {
285+
if($size != 0 && !is_nan($size)) {
286286
$base=log($size)/log(1024);
287287
$tmpoutput = round(pow(1024, $base-floor($base)), $precision).$suffixes[floor($base)];
288288
} else {

‎interface/lib/lang/nl.lng‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ $wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'This client has
140140
$wb['yes_txt'] = 'Ja';
141141
$wb['no_txt'] = 'Nee';
142142
$wb['None'] = 'Geen';
143-
$wb['strength_1'] = 'Weak';
143+
$wb['strength_1'] = 'Zwak';
144144
$wb['strength_2'] = 'Fair';
145-
$wb['strength_3'] = 'Good';
146-
$wb['strength_4'] = 'Strong';
147-
$wb['strength_5'] = 'Very Strong';
145+
$wb['strength_3'] = 'Goed';
146+
$wb['strength_4'] = 'Sterk';
147+
$wb['strength_5'] = 'Zeer sterk';
148148
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
149149
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
150150
$wb['security_check1_txt'] = 'Check for security permission:';
@@ -158,5 +158,8 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
158158
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
159159
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
160160
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
161-
$wb['datalog_changes_close_txt'] = 'Close';
161+
$wb['datalog_changes_close_txt'] = 'Sluiten';
162+
$wb['datalog_status_i_mail_ml_membership'] = 'Create mailing list member';
163+
$wb['datalog_status_u_mail_ml_membership'] = 'Update mailing list member';
164+
$wb['datalog_status_d_mail_ml_membership'] = 'Delete mailing list member';
162165
?>

‎interface/web/admin/lib/lang/nl_remote_user.lng‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ $wb['DNS rp functions'] = 'DNS rp functies';
4040
$wb['DNS srv functions'] = 'DNS srv functies';
4141
$wb['DNS txt functions'] = 'DNS txt functies';
4242
$wb['Mail mailing list functions'] = 'Mail mailinglist functions';
43-
$wb['generate_password_txt'] = 'Generate Password';
44-
$wb['repeat_password_txt'] = 'Repeat Password';
45-
$wb['password_mismatch_txt'] = 'The passwords do not match.';
46-
$wb['password_match_txt'] = 'The passwords do match.';
43+
$wb['generate_password_txt'] = 'Genereer wachtwoord';
44+
$wb['repeat_password_txt'] = 'Herhaal wachtwoord';
45+
$wb['password_mismatch_txt'] = 'De wachtwoorden zijn niet hetzelfde.';
46+
$wb['password_match_txt'] = 'De wachtwoorden zijn hetzelfde.';
47+
$wb['remote_access_txt'] = 'Externe toegang';
48+
$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for <i>any</i>)';
49+
$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.';
4750
?>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,4 +283,10 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH';
283283
$wb['backup_time_txt'] = 'Backup time';
284284
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
285285
$wb['migration_mode_txt'] = 'Server Migration Mode';
286+
$wb['nagios_url_txt'] = 'Nagios/Check_MK URL';
287+
$wb['nagios_user_txt'] = 'Nagios/Check_MK User';
288+
$wb['nagios_password_txt'] = 'Nagios/Check_MK Password';
289+
$wb['nagios_url_error_regex'] = 'Invalid Nagios/Check_MK URL';
290+
$wb['nagios_url_note_txt'] = 'Check_MK is being autodetected. Placeholder:';
291+
$wb['mailinglist_manager_txt'] = 'Mailinglist Manager';
286292
?>

‎interface/web/admin/lib/lang/nl_system_config.lng‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,10 @@ $wb['default_dbserver_txt'] = 'Default Database Server';
8585
$wb['ca_name_txt'] = 'Name';
8686
$wb['ca_issue_txt'] = 'Issue';
8787
$wb['ca_wildcard_txt'] = 'Use Wildcard';
88-
$wb['ca_critical_txt'] = 'Strict Check'; //For future use. At this time, CA<E2><80><99>s do not recognize any other flag values as described in RFC 6844
88+
$wb['ca_critical_txt'] = 'Strict Check';
8989
$wb['ca_iodef_txt'] = 'iodef';
9090
$wb['active_txt'] = 'Aktive';
9191
$wb['btn_save_txt'] = 'Save';
9292
$wb['btn_cancel_txt'] = 'Cancel';
93+
$wb['asp_new_package_disabled_txt'] = 'Disable new aps packages';
9394
?>

‎interface/web/client/lib/lang/nl_client_message_template.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting';
88
$wb['variables_txt'] = 'Variables';
99
$wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)';
1010
$wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';
11+
$wb['subject_error_empty'] = 'Subject is empty';
12+
$wb['message_error_empty'] = 'Message is empty';
1113
?>

‎interface/web/dashboard/dashboard.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,13 @@
160160
$handle = @opendir(ISPC_WEB_PATH.'/dashboard/dashlets');
161161
while ($file = @readdir($handle)) {
162162
if ($file != '.' && $file != '..' && !is_dir(ISPC_WEB_PATH.'/dashboard/dashlets/'.$file)) {
163-
$dashlet_name = substr($file, 0, -4);
164-
$dashlet_class = 'dashlet_'.$dashlet_name;
165-
include_once ISPC_WEB_PATH.'/dashboard/dashlets/'.$file;
166-
$dashlet_list[$dashlet_name] = new $dashlet_class;
163+
$splitfilename = explode('.', $file);
164+
if (end($splitfilename) == 'php') { // only allow .php files
165+
$dashlet_name = substr($file, 0, -4);
166+
$dashlet_class = 'dashlet_'.$dashlet_name;
167+
include_once ISPC_WEB_PATH.'/dashboard/dashlets/'.$file;
168+
$dashlet_list[$dashlet_name] = new $dashlet_class;
169+
}
167170
}
168171
}
169172

‎interface/web/dashboard/dashlets/databasequota.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,15 @@ function show() {
1818

1919
$databases = $app->quota_lib->get_databasequota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['client_id'] : null);
2020
//print_r($databases);
21-
2221
$has_databasequota = false;
2322
if(is_array($databases) && !empty($databases)){
2423
$databases = $app->functions->htmlentities($databases);
2524
$tpl->setloop('databasequota', $databases);
2625
$has_databasequota = isset($databases[0]['used']);
2726
}
2827
$tpl->setVar('has_databasequota', $has_databasequota);
29-
28+
//var_dump($tpl);
3029
return $tpl->grab();
3130
}
32-
3331
}
34-
35-
36-
37-
38-
39-
40-
41-
4232
?>

‎interface/web/dashboard/dashlets/limits.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,16 @@ function show() {
144144
if($value != 0 || $value == $wb['unlimited_txt']) {
145145
$value_formatted = ($value == '-1')?$wb['unlimited_txt']:$value;
146146
$usage = $this->_get_limit_usage($limit);
147-
$percentage = ($value == '-1' || $value == 0 ? 0 : round(100 * $usage / $value));
147+
$percentage = ($value == '-1' || $value == 0 ? -1 : round(100 * $usage / $value));
148+
$progressbar = $percentage > 100 ? 100 : $percentage;
148149
$rows[] = array('field' => $field,
149150
'field_txt' => $wb[$field.'_txt'],
150151
'value' => $value_formatted,
151152
'value_raw' => $value,
152153
'usage' => $usage,
153154
'usage_raw' => $usage,
154-
'percentage' => $percentage);
155+
'percentage' => $percentage,
156+
'progressbar' => $progressbar);
155157
}
156158
}
157159
$rows = $app->functions->htmlentities($rows);

‎interface/web/dashboard/dashlets/templates/databasequota.htm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<caption>{tmpl_var name='databasequota_txt'}</caption>
44
<thead class="dark form-group-sm">
55
<tr>
6-
<th>{tmpl_var name='database_txt'}</th>
7-
<th>{tmpl_var name='used_txt'}</th>
8-
<th colspan="2">{tmpl_var name='quota_txt'}</th>
6+
<th class="col-md-2">{tmpl_var name='database_txt'}</th>
7+
<th class="col-md-2">{tmpl_var name='used_txt'}</th>
8+
<th class="col-md-3" colspan="2">{tmpl_var name='quota_txt'}</th>
99
</tr>
1010
</thead>
1111
<tbody>
@@ -14,15 +14,15 @@
1414
<td>{tmpl_var name='database_name'}</td>
1515
<td>{tmpl_var name='used'}</td>
1616
<td>{tmpl_var name='database_quota'}</td>
17-
<td>
17+
{tmpl_if name="database_quota" op="!=" value="unlimited"}<td>
1818
<div class='progress'>
19-
<div class='progress-bar progress-bar-{tmpl_if name="used_percentage" op="<" value="50"}success{tmpl_elseif name="used_percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role='progressbar' aria-valuemin='0' aria-valuemax='100' aria-valuenow='{tmpl_var name="used_percentage"}' style='width:{tmpl_var name="used_percentage"}%' data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='used_percentage'}%">
19+
<div class='progress-bar-striped progress-bar progress-bar-{tmpl_if name="used_percentage" op="<" value="50"}success{tmpl_elseif name="used_percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role='progressbar' aria-valuemin='0' aria-valuemax='100' aria-valuenow='{tmpl_var name="used_percentage"}' style='width: {tmpl_var name="used_percentage"}%'>{tmpl_var name="used_percentage"}%
2020
<span class='sr-only'>{tmpl_var name='used'} {tmpl_var name='of_txt'} {tmpl_var name='database_quota'}</span>
2121
</div>
2222
</div>
23-
</td>
23+
</td><tmpl_else><td></td>{/tmpl_if}
2424
</tr>
2525
</tmpl_loop>
2626
</tbody>
2727
</table>
28-
</div>
28+
</div>

0 commit comments

Comments
 (0)