diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
index 3946b216dd1af6cfe7da05e292a915164e5c0ffa..3bae97f046ada93cb7c701dfb5d52ffa58e7ad8f 100644
--- a/interface/lib/classes/quota_lib.inc.php
+++ b/interface/lib/classes/quota_lib.inc.php
@@ -71,11 +71,11 @@ class quota_lib {
$sites[$i]['hard'] .= ' KB';
}
- if($sites[$i]['soft'] == " KB") $sites[$i]['soft'] = $app->lng('unlimited');
- if($sites[$i]['hard'] == " KB") $sites[$i]['hard'] = $app->lng('unlimited');
+ if($sites[$i]['soft'] == " KB") $sites[$i]['soft'] = $app->lng('unlimited_txt');
+ if($sites[$i]['hard'] == " KB") $sites[$i]['hard'] = $app->lng('unlimited_txt');
- if($sites[$i]['soft'] == '0 B' || $sites[$i]['soft'] == '0 KB' || $sites[$i]['soft'] == '0') $sites[$i]['soft'] = $app->lng('unlimited');
- if($sites[$i]['hard'] == '0 B' || $sites[$i]['hard'] == '0 KB' || $sites[$i]['hard'] == '0') $sites[$i]['hard'] = $app->lng('unlimited');
+ if($sites[$i]['soft'] == '0 B' || $sites[$i]['soft'] == '0 KB' || $sites[$i]['soft'] == '0') $sites[$i]['soft'] = $app->lng('unlimited_txt');
+ if($sites[$i]['hard'] == '0 B' || $sites[$i]['hard'] == '0 KB' || $sites[$i]['hard'] == '0') $sites[$i]['hard'] = $app->lng('unlimited_txt');
/*
if(!strstr($sites[$i]['used'],'M') && !strstr($sites[$i]['used'],'K')) $sites[$i]['used'].= ' B';
@@ -266,7 +266,7 @@ class quota_lib {
if($used_ratio >= 1) $emails[$i]['display_colour'] = '#cc0000';
if($emails[$i]['quota'] == 0){
- $emails[$i]['quota'] = $app->lng('unlimited');
+ $emails[$i]['quota'] = $app->lng('unlimited_txt');
} else {
$emails[$i]['quota'] = round($emails[$i]['quota'] / 1048576, 1).' MB';
}
@@ -327,7 +327,7 @@ class quota_lib {
if($used_ratio >= 1) $databases[$i]['display_colour'] = '#cc0000';
if($databases[$i]['database_quota'] == 0){
- $databases[$i]['database_quota'] = $app->lng('unlimited');
+ $databases[$i]['database_quota'] = $app->lng('unlimited_txt');
} else {
$databases[$i]['database_quota'] = $databases[$i]['database_quota'] . ' MB';
}
diff --git a/interface/lib/classes/remote.d/sites.inc.php b/interface/lib/classes/remote.d/sites.inc.php
index 59c2e371f34f89a7d25714e610cc7a252b761980..d90b90bd8910a09c733847156fe3641c57292816 100644
--- a/interface/lib/classes/remote.d/sites.inc.php
+++ b/interface/lib/classes/remote.d/sites.inc.php
@@ -423,7 +423,7 @@ class remoting_sites extends remoting {
$params['client_group_id'] = $rec['groupid'];
}
- //* Set a few params to "not empty" values which get overwritten by the sites_web_domain_plugin
+ //* Set a few params to "not empty" values which get overwritten by the sites_web_vhost_domain_plugin
if($params['document_root'] == '') $params['document_root'] = '-';
if($params['system_user'] == '') $params['system_user'] = '-';
if($params['system_group'] == '') $params['system_group'] = '-';
diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng
index 25dd92083138df99e34cf3d1f6cb5057af80c3b1..f8fd2b5a500479b4dff5741a0ded9410f648db78 100644
--- a/interface/lib/lang/ar.lng
+++ b/interface/lib/lang/ar.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
?>
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
index ff1e39fe34d9ba526550d6276e425f8d12d9a3a4..049807e66da3712e215a7b6f62734ebaecdef900 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Ðеограничен';
?>
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
index 60a0dcf9109eab72c233cbf2be1309f1bf0679b1..3bab13ab3a40eb40f83e06798bf32d1332f9ffce 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -158,4 +158,5 @@ $wb['security_check1_txt'] = 'Verifique as permissões de segurança:';
$wb['security_check2_txt'] = 'falhou.';
$wb['select_directive_snippet_txt'] = 'Diretiva de trechos de código';
$wb['select_master_directive_snippet_txt'] = 'Diretiva mestre de trechos de código';
+$wb['unlimited_txt'] = 'Ilimitado';
?>
diff --git a/interface/lib/lang/ca.lng b/interface/lib/lang/ca.lng
index c39cd0db272fcd0861f0fad0b5d448a6a119c202..6d48482cfc5f5c97825505de23a7fb80abd07aea 100644
--- a/interface/lib/lang/ca.lng
+++ b/interface/lib/lang/ca.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Illimité';
?>
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index eeb0819292eac0260fbfdc5121b8c5a252640a73..93eeb671e5ffc32a0f9e19d647f42cbfcf569ece 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Smazat XMPP doménu';
$wb['datalog_status_i_xmpp_user'] = 'Vytvořit XMPP uživatele';
$wb['datalog_status_u_xmpp_user'] = 'Aktualizovat XMPP uživatele';
$wb['datalog_status_d_xmpp_user'] = 'Smazat XMPP uživatele';
+$wb['unlimited_txt'] = 'neomezeno';
?>
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index 61551ceeab566d7472f5d4f41687703edf63a34a..54091c14170786b83b4d68c79b801d3dff280c56 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -158,4 +158,5 @@ $wb['security_check1_txt'] = 'Sicherheitsüberprüfung für:';
$wb['security_check2_txt'] = 'fehlgeschlagen.';
$wb['select_directive_snippet_txt'] = 'Direktiven Schnipsel';
$wb['select_master_directive_snippet_txt'] = 'Master Direktiven Schnipsel';
+$wb['unlimited_txt'] = 'unlimitiert';
?>
diff --git a/interface/lib/lang/dk.lng b/interface/lib/lang/dk.lng
index 798d2ccd451ef6d6f3d02cb7fbe4869de621754d..cbb9fc5efdc46db92761845cca3164f8224c08c1 100644
--- a/interface/lib/lang/dk.lng
+++ b/interface/lib/lang/dk.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Ubegrænset';
?>
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index 382bf4a75839c737702cb9124cd900d739c044f8..3e6c60c90f451a81acfed2b2e904c3df6074d422 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'ΑπεÏιόÏιστα';
?>
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index 66f4ee3811efc6c82b08b4338cfafc33c5013d9e..b5b2ebcdae470767a4fe90494fca53fe974236e6 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -159,4 +159,5 @@ $wb['security_check1_txt'] = 'Check for security permission:';
$wb['security_check2_txt'] = 'failed.';
$wb['select_directive_snippet_txt'] = 'Directive Snippets';
$wb['select_master_directive_snippet_txt'] = 'Master Directive Snippets';
-?>
\ No newline at end of file
+$wb['unlimited_txt'] = "Unlimited";
+?>
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
index 3b1bae0b469eb7e9e1a904c6d41e320e0b980efc..b78499f80022dc44300273382d58c10dd86ae090 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Ilimitado';
?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index d4c23ca777a6388718c07c4be4f6883b99392476..27749510bb0096803b629935fec60b6e23afcd3c 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index 3e9bfa8daa4521f3c5a568df8ff0e4a6932115a3..c302b32faa302e897af10b0aae59e993fbc0af48 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Illimité';
?>
diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng
index 310371be479f1ea8d250aa7956dd7da305318817..3be5dc7e16ea3dfbdc161ac8d1196ccb368f87c3 100644
--- a/interface/lib/lang/hr.lng
+++ b/interface/lib/lang/hr.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'neograniÄeno';
?>
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
index dd4cce79b3bffd015b61ffc7c06379148e78b677..3fc91bd60095011e8d867cc26b0a963c0e847ce4 100644
--- a/interface/lib/lang/hu.lng
+++ b/interface/lib/lang/hu.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Korlátlan';
?>
diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng
index bd90fd5a1b5e10cb294cec6ff7486a3365bb61e4..13fbff1a0800e7484f367858a26b809409f96916 100644
--- a/interface/lib/lang/id.lng
+++ b/interface/lib/lang/id.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Tak terbatas';
?>
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index 33d16c3d5f66d055bfabf69dc69e4dbc7a16ae51..4a85a58e09266d2db52c2aaeff90667b9db77ef3 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'illimitati';
?>
diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng
index 2a56e77399dc0a7d9f98fabba751d7e909082525..bb1290173c6a83bbcbceba6c2ff00f23442b99b5 100644
--- a/interface/lib/lang/ja.lng
+++ b/interface/lib/lang/ja.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index 888f9c020098702b7d3c1e4b8e9a956419bbee71..a733142d49100c3b025c69ce20b387f00c74ecb9 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Ongelimiteerd';
?>
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index b5b62c816dd9a20b699ee7eaef9bc076d7af3c6b..ffbac09ef4008cf2bbbd0a0456a99ff758d6a9c5 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'nielimitowane';
?>
diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng
index 7845520a5bb8db428dab5d281e2bfe476eb725c3..195da8e61926311839005a8b7bf6be3ad1bd319c 100644
--- a/interface/lib/lang/pt.lng
+++ b/interface/lib/lang/pt.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
?>
diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng
index 613f2377a12bfe152ad2bcc0764ed4480cc8ac51..1365a54172f3098dc1e8d5eba983730a46bc8c02 100644
--- a/interface/lib/lang/ro.lng
+++ b/interface/lib/lang/ro.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
?>
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index e5e8ce627824d16df119106f9ec94c5dce8e8bce..19cdcf8a047170d3f36b310801ae3a1ffcd40318 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Удалить домен XMPP';
$wb['datalog_status_i_xmpp_user'] = 'Создать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ XMPP';
$wb['datalog_status_u_xmpp_user'] = 'Обновить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ XMPP';
$wb['datalog_status_d_xmpp_user'] = 'Удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ XMPP';
+$wb['unlimited_txt'] = 'Безлимитный';
?>
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index b6767144df9eaaca9528a3666128a2a6af85f114..2d3146f03389ae3acae8fd72c36a1f5c1c89b386 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Obegränsat';
?>
diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng
index 6b4ef7676f8f38e29409f6b649a3b063670c6853..ece15b3a22865520884ac048cd12e0ba679504aa 100644
--- a/interface/lib/lang/sk.lng
+++ b/interface/lib/lang/sk.lng
@@ -158,4 +158,5 @@ $wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
+$wb['unlimited_txt'] = 'Unlimited';
?>
diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng
index cf4491ad5d963701364a3f3005ca24a36b0d695a..31e5f2fbef4e7c47d45321d8bcc3cd08c1701cee 100644
--- a/interface/lib/lang/tr.lng
+++ b/interface/lib/lang/tr.lng
@@ -159,4 +159,5 @@ $wb['security_check1_txt'] = 'Güvenlik iznini denetle:';
$wb['security_check2_txt'] = 'başarısız.';
$wb['select_directive_snippet_txt'] = 'Yönerge Kod Parçaları';
$wb['select_master_directive_snippet_txt'] = 'Ana Komut Parçaları';
+$wb['unlimited_txt'] = 'Sınırsız';
?>
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
index 26c0b02b83dcc646495a0056a79b20f71a72cc53..ccf58b853c0bb3b9da0224b527558507f4a62ead 100644
--- a/interface/lib/plugins/mail_user_filter_plugin.inc.php
+++ b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -80,7 +80,7 @@ class mail_user_filter_plugin {
}
}
- // We did not found our rule, so we add it now as first rule.
+ // We did not find our rule, so we add it now as first rule.
if($found == false && $page_form->dataRecord["active"] == 'y') {
$new_rule = $this->mail_user_filter_get_rule($page_form);
$out = $new_rule . $out;
@@ -92,7 +92,7 @@ class mail_user_filter_plugin {
}
/*
- * Remove the rendered filter from custom_mailfilter when a mail_user_filter is deleted
+ * Remove the rendered filter from custom_mailfilter when a mail_user_filter is deleted.
*/
function mail_user_filter_del($event_name, $page_form) {
global $app, $conf;
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
index 6ec82aad5bd18a38c636383f0f415a0b172c5c96..b15261dfc421c88c018bc81c790b14815ad08322 100644
--- a/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Account limits';
$wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng b/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng
index dad751aaf08f94d1233419e933c66db400597314..961e6825df2fdb495e131a1258d4086148e72828 100644
--- a/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Ðкаунт ограничениÑ';
$wb['of_txt'] = 'на';
-$wb['unlimited_txt'] = 'Ðеограничен';
$wb['limit_maildomain_txt'] = 'Брой на email домейни';
$wb['limit_mailbox_txt'] = 'Брой на пощенÑките кутии';
$wb['limit_mailalias_txt'] = 'Брой на email пÑевдоними';
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_limits.lng b/interface/web/dashboard/lib/lang/br_dashlet_limits.lng
index 72558f5797f462adac944a2d4a43b6f3bb956ea1..739c7e44454b8c08e9f1de699880a44b965ee920 100644
--- a/interface/web/dashboard/lib/lang/br_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/br_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Limites de contas';
$wb['of_txt'] = 'de';
-$wb['unlimited_txt'] = 'Ilimitado';
$wb['limit_maildomain_txt'] = 'Número de domÃnios de e-mail';
$wb['limit_mailmailinglist_txt'] = 'Número de listas de e-mail';
$wb['limit_mailbox_txt'] = 'Número de contas de e-mail';
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng
index f482b47e38b0bab17dd6d0c0d2b4c169c8d9b904..ae78112c858cf3cd53484e95400e0398b3f30b2f 100644
--- a/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Limites du compte';
$wb['of_txt'] = 'sur';
-$wb['unlimited_txt'] = 'Illimité';
$wb['limit_maildomain_txt'] = 'Nombre de domaines courriel';
$wb['limit_mailmailinglist_txt'] = 'Nombre de mailing lists';
$wb['limit_mailbox_txt'] = 'Nombre de boites courriel';
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
index a7aecc4a539beb0a074f7744ece25e94068dab5e..d93dd87761b0a2dc300adf984389dc76efe8cc09 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Limity úÄtů';
$wb['of_txt'] = 'z';
-$wb['unlimited_txt'] = 'neomezeno';
$wb['limit_maildomain_txt'] = 'PoÄet e-mailových domén';
$wb['limit_mailbox_txt'] = 'PoÄet e-mailových schránek';
$wb['limit_mailalias_txt'] = 'PoÄet e-mailových pÅ™ezdÃvek';
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
index 335c17ca85afd24f86e155de0dfe5743cf8f3490..22e87237d5d6b1716a253f285bf9b530b590dcba 100644
--- a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Kontobeschränkungen';
$wb['of_txt'] = 'von';
-$wb['unlimited_txt'] = 'unlimitiert';
$wb['limit_maildomain_txt'] = 'Anzahl der E-Mail Domains';
$wb['limit_mailbox_txt'] = 'Anzahl der E-Mail Konten';
$wb['limit_mailalias_txt'] = 'Anzahl der E-Mail Aliase';
diff --git a/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng b/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng
index eb128750b2c84265319f5ccc71df3e8c318e16f5..402aa722f514f5486d454419bfe91768fdda74f8 100644
--- a/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Konto begrænsninger';
$wb['of_txt'] = 'af';
-$wb['unlimited_txt'] = 'Ubegrænset';
$wb['limit_maildomain_txt'] = 'Antal af e-mail domæner';
$wb['limit_mailmailinglist_txt'] = 'Antal af mail-lister';
$wb['limit_mailbox_txt'] = 'Antal af mail-bokse';
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
index dac3b556232f3a3199b4220f66e3c787590c9e64..f51c1da1b5cc87cf0f97c731acf8d3e85e304c41 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'ÎŒÏια ΛογαÏιασμών';
$wb['of_txt'] = 'από';
-$wb['unlimited_txt'] = 'ΑπεÏιόÏιστα';
$wb['limit_maildomain_txt'] = 'ΑÏιθμός email domains';
$wb['limit_mailbox_txt'] = 'ΑÏιθμός θυÏίδων';
$wb['limit_mailalias_txt'] = 'ΑÏιθμός ψευδωνÏμων email';
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_limits.lng b/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
index 5d504c8e9b6e91dd62aa181fcd354781b5470567..d30977799f768537bd6723115f7caa1596287709 100644
--- a/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = "Account limits";
$wb['of_txt'] = "of";
-$wb['unlimited_txt'] = "Unlimited";
$wb['limit_maildomain_txt'] = "Number of email domains";
$wb['limit_mailmailinglist_txt'] = "Number of mailing lists";
$wb['limit_mailbox_txt'] = "Number of mailboxes";
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_limits.lng b/interface/web/dashboard/lib/lang/es_dashlet_limits.lng
index da6cd6b513fb9fa4f5f3ec258be6ac2ade7c95ab..d56d17c6615dbc071ca039ff7190e569d520370a 100755
--- a/interface/web/dashboard/lib/lang/es_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/es_dashlet_limits.lng
@@ -27,7 +27,6 @@ $wb['limit_web_subdomain_txt'] = 'Cantidad de sub-dominios';
$wb['limit_webdav_user_txt'] = 'Cantidad de usuarios Webdav';
$wb['limits_txt'] = 'LÃmites de la cuenta';
$wb['of_txt'] = 'de';
-$wb['unlimited_txt'] = 'Ilimitado';
$wb['limit_mailquota_txt'] = 'Assigned mailbox quota';
$wb['limit_web_quota_txt'] = 'Assigned web quota';
$wb['limit_database_quota_txt'] = 'Assigned database quota';
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
index 6ec82aad5bd18a38c636383f0f415a0b172c5c96..b15261dfc421c88c018bc81c790b14815ad08322 100644
--- a/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Account limits';
$wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng
index 525249f6d44ce91a5c54d43448f593096ce43e27..fa5043ab85ac7fa31637f53e2c24eda50c83aace 100644
--- a/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Limites du compte';
$wb['of_txt'] = 'sur';
-$wb['unlimited_txt'] = 'Illimité';
$wb['limit_maildomain_txt'] = 'Nombre de domaines e-mail';
$wb['limit_mailmailinglist_txt'] = 'Nombre de liste de distribution';
$wb['limit_mailbox_txt'] = 'Nombre de boîtes aux lettres';
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
index 1a3db42a24c7711caa7634567a94b92ccfb9a169..2aa1792f91559950cb35a9ab0ffe6cd24074ecde 100644
--- a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'OgraniÄenja';
$wb['of_txt'] = 'od';
-$wb['unlimited_txt'] = 'neograniÄeno';
$wb['limit_maildomain_txt'] = 'Mail domene';
$wb['limit_mailbox_txt'] = 'Mailboxi';
$wb['limit_mailalias_txt'] = 'Mail aliasi';
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng
index 13c5a4e45029a8c48a919ede5a071cfe2db3d8ab..76498eed86f896ebb972effc317e771f422c27b3 100644
--- a/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Account limits';
$wb['of_txt'] = '-';
-$wb['unlimited_txt'] = 'Korlátlan';
$wb['limit_maildomain_txt'] = 'Email domainek száma';
$wb['limit_mailbox_txt'] = 'Mailbox-ok száma';
$wb['limit_mailalias_txt'] = 'Email aliasok száma';
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_limits.lng b/interface/web/dashboard/lib/lang/id_dashlet_limits.lng
index 8079b742b790194010abaaa99426d1f4c88a1492..94a64e226f6090ac1e0beddab50ee4c2d7dc4ea6 100644
--- a/interface/web/dashboard/lib/lang/id_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/id_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Batasan Akun';
$wb['of_txt'] = 'dari';
-$wb['unlimited_txt'] = 'Tak terbatas';
$wb['limit_maildomain_txt'] = 'Jumlah domain email';
$wb['limit_mailbox_txt'] = 'Jumlah mailbox';
$wb['limit_mailalias_txt'] = 'Jumlah alias email';
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_limits.lng b/interface/web/dashboard/lib/lang/it_dashlet_limits.lng
index a1a2000edf88d00db8e8ee9b876265901bed1821..dd83e1ad5847834f7b1b173fe4836167e25146f9 100644
--- a/interface/web/dashboard/lib/lang/it_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/it_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Sintesi account';
$wb['of_txt'] = 'su';
-$wb['unlimited_txt'] = 'illimitati';
$wb['limit_maildomain_txt'] = 'Domini email';
$wb['limit_mailbox_txt'] = 'Caselle email';
$wb['limit_mailalias_txt'] = 'Alias di email';
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
index 6ec82aad5bd18a38c636383f0f415a0b172c5c96..b15261dfc421c88c018bc81c790b14815ad08322 100644
--- a/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Account limits';
$wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng
index 10d1e8283713a6f5ed63e94116bce6baff1378fe..35a2b9e0bed100408e82431f38354e326ab3bebf 100644
--- a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Account limieten';
$wb['of_txt'] = 'van';
-$wb['unlimited_txt'] = 'Ongelimiteerd';
$wb['limit_maildomain_txt'] = 'Aantal email domeinen';
$wb['limit_mailbox_txt'] = 'Aantal mailboxes';
$wb['limit_mailalias_txt'] = 'Aantal e-mail aliassen';
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
index 4d5b971469952abfef8425650c7f7ae1e511ab11..5513b32551afdce00566c74f02c63f85fce8ea1b 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Limity konta';
$wb['of_txt'] = 'z';
-$wb['unlimited_txt'] = 'nielimitowane';
$wb['limit_maildomain_txt'] = 'Liczba domen e-mail';
$wb['limit_mailbox_txt'] = 'Liczba skrzynek pocztowych';
$wb['limit_mailalias_txt'] = 'Liczba aliasów e-mail';
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
index 6ec82aad5bd18a38c636383f0f415a0b172c5c96..b15261dfc421c88c018bc81c790b14815ad08322 100644
--- a/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Account limits';
$wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
index 6ec82aad5bd18a38c636383f0f415a0b172c5c96..b15261dfc421c88c018bc81c790b14815ad08322 100644
--- a/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Account limits';
$wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng
index 19295b65e378928825bfe97a34d7338862d7f2c7..9e77f43d8d115a4b792ce723d1f5f474d186eb57 100644
--- a/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Лимиты учётной запиÑи';
$wb['of_txt'] = 'из';
-$wb['unlimited_txt'] = 'Безлимитный';
$wb['limit_maildomain_txt'] = 'КоличеÑтво почтовых аккаунтов';
$wb['limit_mailbox_txt'] = 'КоличеÑтво почтовых Ñщиков';
$wb['limit_mailalias_txt'] = 'КоличеÑтво алиаÑов почты';
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
index d1f38b1b0deb8bc41d5e9078f1022a16536e076c..f02f83bffd4133794f554b99eb2c8def0e210205 100644
--- a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Kontogränser';
$wb['of_txt'] = 'av';
-$wb['unlimited_txt'] = 'Obegränsat';
$wb['limit_maildomain_txt'] = 'Antal epostdomäner';
$wb['limit_mailbox_txt'] = 'Antal epostkonton';
$wb['limit_mailalias_txt'] = 'Antal epostalias';
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng b/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
index 6ec82aad5bd18a38c636383f0f415a0b172c5c96..b15261dfc421c88c018bc81c790b14815ad08322 100644
--- a/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Account limits';
$wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
$wb['limit_maildomain_txt'] = 'Number of email domains';
$wb['limit_mailbox_txt'] = 'Number of mailboxes';
$wb['limit_mailalias_txt'] = 'Number of email aliases';
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
index 9fa1fb5b90595d9bd20405927d4536876d82d76e..6a4a6a0d242ce70939e727db129d476e66bd5e96 100644
--- a/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
@@ -1,7 +1,6 @@
<?php
$wb['limits_txt'] = 'Hesap Sınırları';
$wb['of_txt'] = '/';
-$wb['unlimited_txt'] = 'Sınırsız';
$wb['limit_maildomain_txt'] = 'E-posta Etki Alanı Sayısı';
$wb['limit_mailmailinglist_txt'] = 'E-posta Listesi Sayısı';
$wb['limit_mailbox_txt'] = 'E-posta Kutusu Sayısı';
diff --git a/interface/web/mail/user_quota_stats.php b/interface/web/mail/user_quota_stats.php
index 90a92558fa03871336c6396fe2dee241ab1e724b..9699acafda6f5e8f90292b403bd4f860967b2864 100644
--- a/interface/web/mail/user_quota_stats.php
+++ b/interface/web/mail/user_quota_stats.php
@@ -52,7 +52,7 @@ class list_action extends listform_actions {
if (!is_numeric($rec['used'])) $rec['used']=$rec['used'][1];
if($rec['quota'] == 0){
- $rec['quota'] = $app->lng('unlimited');
+ $rec['quota'] = $app->lng('unlimited_txt');
$rec['percentage'] = '';
$rec['percentage_sort'] = 0;
} else {
diff --git a/interface/web/sites/database_quota_stats.php b/interface/web/sites/database_quota_stats.php
index 5f550cf8d141a352945e86bda2eca4ff31f6854a..4e960bce27e9323267ea673948929864efd1faf8 100644
--- a/interface/web/sites/database_quota_stats.php
+++ b/interface/web/sites/database_quota_stats.php
@@ -72,7 +72,7 @@ class list_action extends listform_actions {
$rec['quota'] = $monitor_data[$rec['server_id'].'.'.$database_name]['quota'];
if($rec['quota'] == 0){
- $rec['quota'] = $app->lng('unlimited');
+ $rec['quota'] = $app->lng('unlimited_txt');
$rec['percentage'] = '';
} else {
if ($rec['used'] > 0 ) $rec['percentage'] = round(100 * intval($rec['used']) / ( intval($rec['quota'])*1024*1024) ).'%';
diff --git a/interface/web/sites/user_quota_stats.php b/interface/web/sites/user_quota_stats.php
index 9c9300807647fa9b499279a0900ac2d43fab3feb..8c641eede9726d7f9f0818c840872bb018887263 100644
--- a/interface/web/sites/user_quota_stats.php
+++ b/interface/web/sites/user_quota_stats.php
@@ -63,8 +63,8 @@ class list_action extends listform_actions {
$rec['used']=$app->functions->formatBytes($rec['used']*1024);
$rec['soft']=$app->functions->formatBytes($rec['soft']*1024);
$rec['hard']=$app->functions->formatBytes($rec['hard']*1024);
- if($rec['soft'] == "NAN") $rec['soft'] = $app->lng('unlimited');
- if($rec['hard'] == "NAN") $rec['hard'] = $app->lng('unlimited');
+ if($rec['soft'] == "NAN") $rec['soft'] = $app->lng('unlimited_txt');
+ if($rec['hard'] == "NAN") $rec['hard'] = $app->lng('unlimited_txt');
/*
if($rec['used'] > 1024) {
$rec['used'] = round($rec['used'] / 1024, 2).' MB';
@@ -84,8 +84,8 @@ class list_action extends listform_actions {
$rec['hard'] .= ' KB';
}
- if($rec['soft'] == " KB") $rec['soft'] = $app->lng('unlimited');
- if($rec['hard'] == " KB") $rec['hard'] = $app->lng('unlimited');
+ if($rec['soft'] == " KB") $rec['soft'] = $app->lng('unlimited_txt');
+ if($rec['hard'] == " KB") $rec['hard'] = $app->lng('unlimited_txt');
*/
/*
@@ -94,8 +94,8 @@ class list_action extends listform_actions {
if(!strstr($rec['hard'],'M') && !strstr($rec['hard'],'K')) $rec['hard'].= ' B';
*/
/*
- if($rec['soft'] == '0 B' || $rec['soft'] == '0 KB' || $rec['soft'] == '0') $rec['soft'] = $app->lng('unlimited');
- if($rec['hard'] == '0 B' || $rec['hard'] == '0 KB' || $rec['hard'] == '0') $rec['hard'] = $app->lng('unlimited');
+ if($rec['soft'] == '0 B' || $rec['soft'] == '0 KB' || $rec['soft'] == '0') $rec['soft'] = $app->lng('unlimited_txt');
+ if($rec['hard'] == '0 B' || $rec['hard'] == '0 KB' || $rec['hard'] == '0') $rec['hard'] = $app->lng('unlimited_txt');
*/
//* The variable "id" contains always the index variable
$rec['id'] = $rec[$this->idx_key];
diff --git a/remoting_client/API-docs/mail_user_add.html b/remoting_client/API-docs/mail_user_add.html
index 88ab952e6acc79870b152fffb2181ea81e2b3379..a893e24e3f72724372f32a968b5a66d8840604ee 100644
--- a/remoting_client/API-docs/mail_user_add.html
+++ b/remoting_client/API-docs/mail_user_add.html
@@ -25,6 +25,7 @@
<p class="margin"> email (<span class="paratype">varchar(255)</span>)</p>
<p class="margin"> login (<span class="paratype">varchar(255)</span>)</p>
<p class="margin"> password (<span class="paratype">varchar(255)</span>)</p>
+<p class="margin"> _ispconfig_pw_crypted (<span class="paratype">int(11)</span>) Set to 1 to indicate that the password is already crypted.</p>
<p class="margin"> name (<span class="paratype">varchar(255)</span>)</p>
<p class="margin"> uid (<span class="paratype">int(11)</span>)</p>
<p class="margin"> gid (<span class="paratype">int(11)</span>)</p>
diff --git a/remoting_client/API-docs/mail_user_update.html b/remoting_client/API-docs/mail_user_update.html
index 46d23dacf9ac593b43924182ed4ff629d4efe86a..8cb900fb40ccd88d3e5c45a9c7c01faf2e405a23 100644
--- a/remoting_client/API-docs/mail_user_update.html
+++ b/remoting_client/API-docs/mail_user_update.html
@@ -12,7 +12,7 @@
</style></head>
-<body style="color: rgb(0, 0, 0); alink="#804080" link="#804080" vlink="#603060">
+<body style="color: rgb(0, 0, 0);" alink="#804080" link="#804080" vlink="#603060">
<div style="padding:40px">
<h1>mail_user_update(<span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$primary_id</span>, <span class="var">$params</span>);</h1>
<br>
@@ -24,6 +24,7 @@
<p class="margin"> server_id (<span class="paratype">int(11)</span>)</p>
<p class="margin"> email (<span class="paratype">varchar(255)</span>)</p>
<p class="margin"> password (<span class="paratype">varchar(255)</span>)</p>
+<p class="margin"> _ispconfig_pw_crypted (<span class="paratype">int(11)</span>) Set to 1 to indicate that the password is already crypted.</p>
<p class="margin"> name (<span class="paratype">varchar(255)</span>)</p>
<p class="margin"> uid (<span class="paratype">int(11)</span>)</p>
<p class="margin"> gid (<span class="paratype">int(11)</span>)</p>
diff --git a/server/conf/mail/welcome_email_nl.txt b/server/conf/mail/welcome_email_nl.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cd4baf4815aa92e57772cf12b586b9664e01eacc
--- /dev/null
+++ b/server/conf/mail/welcome_email_nl.txt
@@ -0,0 +1,4 @@
+From: ISPConfig <postmaster@localhost.localdomain>
+Subject: Welkom in uw nieuwe account.
+
+Welkom in uw nieuwe email account. Uw webmaster.
diff --git a/server/lib/classes/cron.d/200-logfiles.inc.php b/server/lib/classes/cron.d/200-logfiles.inc.php
index e2d9e9bb9ec0c1df7dd237e6d3f49aea07ee1a75..203d3c0bdac821492ab8d02d68cd2fdf9da965ff 100644
--- a/server/lib/classes/cron.d/200-logfiles.inc.php
+++ b/server/lib/classes/cron.d/200-logfiles.inc.php
@@ -217,7 +217,7 @@ class cronjob_logfiles extends cronjob {
foreach($records as $rec){
$tmp_path = realpath($rec['document_root'].'/tmp');
if($tmp_path != '' && strlen($tmp_path) > 10 && is_dir($tmp_path) && $app->system->is_user($rec['system_user'])){
- exec("cd ?; find . -mtime +1 -name 'sess_*' | grep -v -w .no_delete | xargs rm > /dev/null 2> /dev/null", $tmp_path);
+ $app->system->exec_safe("cd ?; find . -mtime +1 -name 'sess_*' | grep -v -w .no_delete | xargs rm > /dev/null 2> /dev/null", $tmp_path);
}
}
}
diff --git a/server/plugins-available/rspamd_plugin.inc.php b/server/plugins-available/rspamd_plugin.inc.php
index 212cb2c21c79a18be812d9b61e61c4ad9f20a574..4812deb6836586bcad085f5fa48d4e5322e1dcd0 100644
--- a/server/plugins-available/rspamd_plugin.inc.php
+++ b/server/plugins-available/rspamd_plugin.inc.php
@@ -33,7 +33,7 @@ class rspamd_plugin {
var $plugin_name = 'rspamd_plugin';
var $class_name = 'rspamd_plugin';
var $users_config_dir = '/etc/rspamd/local.d/users/';
-
+
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
function onInstall() {
@@ -98,7 +98,7 @@ class rspamd_plugin {
return true;
}
-
+
/*
This function is called when the plugin is loaded
*/
@@ -114,17 +114,17 @@ class rspamd_plugin {
$app->plugins->registerEvent('spamfilter_wblist_insert', $this->plugin_name, 'spamfilter_wblist_insert');
$app->plugins->registerEvent('spamfilter_wblist_update', $this->plugin_name, 'spamfilter_wblist_update');
$app->plugins->registerEvent('spamfilter_wblist_delete', $this->plugin_name, 'spamfilter_wblist_delete');
-
+
//* global mail access filters
$app->plugins->registerEvent('mail_access_insert', $this->plugin_name, 'spamfilter_wblist_insert');
$app->plugins->registerEvent('mail_access_update', $this->plugin_name, 'spamfilter_wblist_update');
$app->plugins->registerEvent('mail_access_delete', $this->plugin_name, 'spamfilter_wblist_delete');
-
+
//* server ip
$app->plugins->registerEvent('server_ip_insert', $this->plugin_name, 'server_ip');
$app->plugins->registerEvent('server_ip_update', $this->plugin_name, 'server_ip');
$app->plugins->registerEvent('server_ip_delete', $this->plugin_name, 'server_ip');
-
+
//* spamfilter_users
$app->plugins->registerEvent('spamfilter_users_insert', $this->plugin_name, 'user_settings_update');
$app->plugins->registerEvent('spamfilter_users_update', $this->plugin_name, 'user_settings_update');
@@ -141,11 +141,11 @@ class rspamd_plugin {
function user_settings_update($event_name, $data) {
global $app, $conf;
-
+
if(!is_dir('/etc/rspamd')) {
return;
}
-
+
$use_data = 'new';
if(substr($event_name, -7) === '_delete') {
$mode = 'delete';
@@ -159,7 +159,7 @@ class rspamd_plugin {
// get the config
$app->uses('getconf,system,functions');
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
-
+
$type = false;
$identifier = false;
$entry_id = false;
@@ -180,7 +180,7 @@ class rspamd_plugin {
$app->log('Invalid event name for rspamd_plugin: ' . $event_name, LOGLEVEL_WARN);
return;
}
-
+
$is_domain = false;
$email_address = $data[$use_data][$identifier];
$settings_name = $email_address;
@@ -199,13 +199,13 @@ class rspamd_plugin {
$email_address = '@' . $email_address;
$is_domain = true;
}
-
+
if($settings_name == '') {
// missing settings file name
$app->log('Empty rspamd identifier in rspamd_plugin from identifier: ' . $use_data . '/' . $identifier, LOGLEVEL_WARN);
return;
}
-
+
$settings_file = $this->users_config_dir . str_replace('@', '_', $settings_name) . '.conf';
//$app->log('Settings file for rspamd is ' . $settings_file, LOGLEVEL_WARN);
if($mode === 'delete') {
@@ -219,11 +219,11 @@ class rspamd_plugin {
} elseif($is_domain === true) {
$settings_priority = 18;
}
-
+
// get policy for entry
if($type === 'spamfilter_user') {
$policy = $app->db->queryOneRecord("SELECT * FROM spamfilter_policy WHERE id = ?", intval($data['new']['policy_id']));
-
+
$check = $app->db->queryOneRecord('SELECT `greylisting` FROM `mail_user` WHERE `server_id` = ? AND `email` = ? UNION SELECT `greylisting` FROM `mail_forwarding` WHERE `server_id` = ? AND `source` = ? ORDER BY (`greylisting` = ?) DESC', $conf['server_id'], $email_address, $conf['server_id'], $email_address, 'y');
if($check) {
$greylisting = $check['greylisting'];
@@ -233,16 +233,16 @@ class rspamd_plugin {
} else {
$search_for_policy[] = $email_address;
$search_for_policy[] = substr($email_address, strpos($email_address, '@'));
-
+
$policy = $app->db->queryOneRecord("SELECT p.* FROM spamfilter_users as u INNER JOIN spamfilter_policy as p ON (p.id = u.policy_id) WHERE u.server_id = ? AND u.email IN ? ORDER BY u.priority DESC", $conf['server_id'], $search_for_policy);
-
+
$greylisting = $data[$use_data]['greylisting'];
}
-
+
if(!is_dir($this->users_config_dir)){
$app->system->mkdirpath($this->users_config_dir);
}
-
+
if(!$this->isValidEmail($app->functions->idn_encode($email_address))) {
if(is_file($settings_file)) {
unlink($settings_file);
@@ -285,7 +285,7 @@ class rspamd_plugin {
}
$tpl->setVar('rspamd_spam_tag_level', floatval($policy['rspamd_spam_tag_level']));
- $tpl->setVar('rspamd_spam_tag_method', floatval($policy['rspamd_spam_tag_method']));
+ $tpl->setVar('rspamd_spam_tag_method', $policy['rspamd_spam_tag_method']);
$tpl->setVar('rspamd_spam_kill_level', floatval($policy['rspamd_spam_kill_level']));
$tpl->setVar('rspamd_virus_kill_level', floatval($policy['rspamd_spam_kill_level']) + 1000);
@@ -324,7 +324,7 @@ class rspamd_plugin {
$app->uses('getconf,system,functions');
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
-
+
if(is_dir('/etc/rspamd')) {
$global_filter = false;
//* Create the config file
@@ -354,12 +354,12 @@ class rspamd_plugin {
);
}
}
-
+
if($data['new']['active'] == 'y' && is_array($filter) && !empty($filter)){
if(!is_dir($this->users_config_dir)){
$app->system->mkdirpath($this->users_config_dir);
}
-
+
$app->load('tpl');
$filter_from = $filter['from'];
@@ -407,13 +407,13 @@ class rspamd_plugin {
} elseif(is_file($wblist_file)) {
unlink($wblist_file);
}
-
+
if($mail_config['content_filter'] == 'rspamd' && is_file('/etc/init.d/rspamd')) {
$app->services->restartServiceDelayed('rspamd', 'reload');
}
}
}
-
+
function spamfilter_wblist_delete($event_name, $data) {
global $app, $conf;
@@ -439,17 +439,17 @@ class rspamd_plugin {
function server_ip($event_name, $data) {
global $app, $conf;
-
+
// get the config
$app->uses("getconf,system");
$app->load('tpl');
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
-
+
if(is_dir('/etc/rspamd')) {
$tpl = new tpl();
$tpl->newTemplate('rspamd_users.conf.master');
-
+
$whitelist_ips = array();
$ips = $app->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ?", $conf['server_id']);
if(is_array($ips) && !empty($ips)){
@@ -459,13 +459,13 @@ class rspamd_plugin {
}
$tpl->setLoop('whitelist_ips', $whitelist_ips);
$app->system->file_put_contents('/etc/rspamd/local.d/users.conf', $tpl->grab());
-
+
if($mail_config['content_filter'] == 'rspamd'){
$app->services->restartServiceDelayed('rspamd', 'reload');
}
}
}
-
+
private function _is_valid_ip_address($ip) {
if(function_exists('filter_var')) {
if(!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) {