Commit 80e18c2c authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'unlimited_clients' into 'master'

Unlimited clients

Allow unlimited clients for reseller
parents 3645f760 f58a7ade
......@@ -36,8 +36,8 @@ class validate_reseller {
function limit_client($field_name, $field_value, $validator) {
global $app;
if($field_value <= 0) {
return $app->tform->lng('limit_client_error_positive');
if($field_value <= 0 && $field_value != -1) {
return $app->tform->lng('limit_client_error_positive_or_unlimited');
} else {
return '';
}
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Addon template';
$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
$wb['web_php_options_txt'] = 'PHP Options';
$wb['limit_client_error'] = 'The max. number of clients is reached.';
$wb['limit_client_error_positive'] = 'The number of clients must be > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0';
$wb['limit_web_quota_txt'] = 'Web Quota';
$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Addon template';
$wb['ssh_chroot_txt'] = 'SSH-Chroot опции';
$wb['web_php_options_txt'] = 'PHP опции';
$wb['limit_client_error'] = 'Макс. брой на Клиентите е достигнат.';
$wb['limit_client_error_positive'] = 'Брой клиенти трябва да е > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'Брой клиенти трябва да е > 0';
$wb['limit_web_quota_txt'] = 'Web Квота';
$wb['limit_traffic_quota_txt'] = 'Трафик квота';
$wb['limit_trafficquota_error_notint'] = 'Трафик квота трябва да е число';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Gabarito de Addon';
$wb['ssh_chroot_txt'] = 'Opções do Chroot-SSH';
$wb['web_php_options_txt'] = 'Opções do PHP';
$wb['limit_client_error'] = 'O número máximo de clientes foi atingido.';
$wb['limit_client_error_positive'] = 'O número de clientes precisa ser > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'O número de clientes precisa ser > 0';
$wb['limit_web_quota_txt'] = 'Cota Web';
$wb['limit_traffic_quota_txt'] = 'Cota de Tráfego';
$wb['limit_trafficquota_error_notint'] = 'a cota de tráfego deve ser um número.';
......
......@@ -88,7 +88,7 @@ $wb['template_additional_txt'] = 'Dodatečná šablona';
$wb['ssh_chroot_txt'] = 'SSH chroot - dostupná volba pro klienta';
$wb['web_php_options_txt'] = 'PHP volby';
$wb['limit_client_error'] = 'Max. počet klientů dosažen.';
$wb['limit_client_error_positive'] = 'Počet klientů musí být > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'Počet klientů musí být > 0';
$wb['limit_web_quota_txt'] = 'Webová kvóta';
$wb['limit_traffic_quota_txt'] = 'Přenosová kvóta';
$wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.';
......
......@@ -97,7 +97,7 @@ $wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar';
$wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar';
$wb['limit_ssl_txt'] = 'SSL verfügbar';
$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
$wb['limit_client_error_positive'] = 'Die Anzahl an Kunden muss > 0 sein';
$wb['limit_client_error_positive_or_unlimited'] = 'Die Anzahl an Kunden muss > 0 sein';
$wb['limit_web_quota_txt'] = 'Speicherplatzbeschränkung';
$wb['limit_traffic_quota_txt'] = 'Transfervolumenbeschränkung';
$wb['limit_trafficquota_error_notint'] = 'Transfervolumenbeschränkung muss eine Zahl sein.';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Πρόσθετο Πρότυπο';
$wb['ssh_chroot_txt'] = 'Επιλογές SSH-Chroot';
$wb['web_php_options_txt'] = 'Επιλογές PHP';
$wb['limit_client_error'] = 'Έχετε φτάσει το μέγιστο πλήθος πελατών.';
$wb['limit_client_error_positive'] = 'Το πλήθος πελατών πρέπει να είναι > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'Το πλήθος πελατών πρέπει να είναι > 0';
$wb['limit_web_quota_txt'] = 'Όριο χώρου Web';
$wb['limit_traffic_quota_txt'] = 'Όριο ταχύτητας';
$wb['limit_trafficquota_error_notint'] = 'Το Όριο ταχύτητας πρέπει να είναι αριθμός.';
......
......@@ -108,7 +108,7 @@ $wb["limit_hterror_txt"] = "Custom error docs available";
$wb["limit_wildcard_txt"] = "Wildcard subdomain available";
$wb["limit_ssl_txt"] = "SSL available";
$wb["limit_client_error"] = 'The max. number of clients is reached.';
$wb["limit_client_error_positive"] = 'The number of clients must be > 0';
$wb["limit_client_error_positive_or_unlimited"] = 'The number of clients must be > 0 or -1 (unlimited)';
$wb["limit_web_quota_txt"] = 'Web Quota';
$wb["limit_traffic_quota_txt"] = 'Traffic Quota';
$wb["limit_trafficquota_error_notint"] = 'Traffic Quota must be a number.';
......
......@@ -90,7 +90,7 @@ $wb['template_additional_txt'] = 'Adicional';
$wb['ssh_chroot_txt'] = 'Opciones SSH-Chroot';
$wb['web_php_options_txt'] = 'Opciones PHP';
$wb['limit_client_error'] = 'Se ha alcanzado el número máximo de clientes.';
$wb['limit_client_error_positive'] = 'El límite de clientes debe ser mayor que cero';
$wb['limit_client_error_positive_or_unlimited'] = 'El límite de clientes debe ser mayor que cero o -1 (ilimitado)';
$wb['limit_web_quota_txt'] = 'Cuota Web';
$wb['limit_traffic_quota_txt'] = 'Cuota de Tráfico';
$wb['limit_trafficquota_error_notint'] = 'Cuota de Tráfico debe ser un número.';
......
......@@ -88,7 +88,7 @@ $wb['template_additional_txt'] = 'Lisämalli';
$wb['ssh_chroot_txt'] = 'SSH-Chroot-valinnat';
$wb['web_php_options_txt'] = 'PHP-valinnat';
$wb['limit_client_error'] = 'Asiakkaiden enimmäismäärä on käytössä.';
$wb['limit_client_error_positive'] = 'Asiakkaiden määrän pitää olla nollaa suurempi';
$wb['limit_client_error_positive_or_unlimited'] = 'Asiakkaiden määrän pitää olla nollaa suurempi';
$wb['limit_web_quota_txt'] = 'WWW-levytila';
$wb['limit_traffic_quota_txt'] = 'Liikenneraja';
$wb['limit_trafficquota_error_notint'] = 'Liikennerajan pitää olla numeerinen.';
......
......@@ -86,7 +86,7 @@ $wb['template_additional_txt'] = 'Modèle additionnel';
$wb['ssh_chroot_txt'] = 'Options Chroot SSH';
$wb['web_php_options_txt'] = 'Options PHP';
$wb['limit_client_error'] = 'Le nombre maximum de client a été atteint.';
$wb['limit_client_error_positive'] = 'Le nombre de clients doit être plus grand que 0.';
$wb['limit_client_error_positive_or_unlimited'] = 'Le nombre de clients doit être plus grand que 0.';
$wb['limit_dns_slave_zone_txt'] = 'Nombre maximum de zones DNS secondaire';
$wb['limit_dns_slave_zone_error_notint'] = 'La limite de zones DNS secondaire doit être un nombre';
$wb['limit_dns_record_error_notint'] = 'Le nombre maximum d\'enregistrements DNS doit être un nombre.';
......
......@@ -93,7 +93,7 @@ $wb['template_additional_txt'] = 'Dodatni predložak';
$wb['ssh_chroot_txt'] = 'SSH-Chroot opcije';
$wb['web_php_options_txt'] = 'PHP opcije';
$wb['limit_client_error'] = 'Maksimalan broj klijenata!';
$wb['limit_client_error_positive'] = 'Broj klijenata mora biti veći od 0.';
$wb['limit_client_error_positive_or_unlimited'] = 'Broj klijenata mora biti veći od 0.';
$wb['limit_web_quota_txt'] = 'Diskovni prostor';
$wb['limit_traffic_quota_txt'] = 'Maksimalni promet';
$wb['limit_trafficquota_error_notint'] = 'Maksimalni promet mora biti znamenka.';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Addon template';
$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
$wb['web_php_options_txt'] = 'PHP Options';
$wb['limit_client_error'] = 'The max. number of clients is reached.';
$wb['limit_client_error_positive'] = 'The number of clients must be > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0';
$wb['limit_web_quota_txt'] = 'Web Quota';
$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
......
......@@ -86,7 +86,7 @@ $wb['template_additional_txt'] = 'Template Addon';
$wb['ssh_chroot_txt'] = 'Opsi SSH-Chroot';
$wb['web_php_options_txt'] = 'Opsi PHP';
$wb['limit_client_error'] = 'Jumlah maks klien telah tercapai.';
$wb['limit_client_error_positive'] = 'Jumlah klien harus > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'Jumlah klien harus > 0';
$wb['limit_web_quota_txt'] = 'Kuota Web';
$wb['limit_traffic_quota_txt'] = 'Kuota Trafik';
$wb['limit_trafficquota_error_notint'] = 'Kuota Trafik harus berupa angka.';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Addon template';
$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
$wb['web_php_options_txt'] = 'PHP Options';
$wb['limit_client_error'] = 'The max. number of clients is reached.';
$wb['limit_client_error_positive'] = 'The number of clients must be > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0';
$wb['limit_web_quota_txt'] = 'Web Quota';
$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'アドオンテンプレート';
$wb['ssh_chroot_txt'] = 'SSH-Chrootオプション';
$wb['web_php_options_txt'] = 'PHPオプション';
$wb['limit_client_error'] = 'クライアントの最大数に達しました。';
$wb['limit_client_error_positive'] = 'クライアント数は1以上で指定してください。';
$wb['limit_client_error_positive_or_unlimited'] = 'クライアント数は1以上で指定してください。';
$wb['limit_web_quota_txt'] = 'Web Quota';
$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Addon template';
$wb['ssh_chroot_txt'] = 'SSH-Chroot Opties';
$wb['web_php_options_txt'] = 'PHP Opties';
$wb['limit_client_error'] = 'Het max. aantal klanten is bereikt.';
$wb['limit_client_error_positive'] = 'Het aantal klanten moet > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'Het aantal klanten moet > 0';
$wb['limit_web_quota_txt'] = 'Web Quota';
$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota moet een numerieke waarde zijn.';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Dodatkowy szablon';
$wb['ssh_chroot_txt'] = 'Opcje roota SSH';
$wb['web_php_options_txt'] = 'Opcje PHP';
$wb['limit_client_error'] = 'Maksymalna ilość klientów została przekroczona.';
$wb['limit_client_error_positive'] = 'Liczba klientów musi być > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'Liczba klientów musi być > 0';
$wb['limit_web_quota_txt'] = 'Limit przestrzeni';
$wb['limit_traffic_quota_txt'] = 'Limit transferu';
$wb['limit_trafficquota_error_notint'] = 'Limit transferu musi być liczbą';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Template de Addon';
$wb['ssh_chroot_txt'] = 'Opções do Chroot-SSH';
$wb['web_php_options_txt'] = 'Opções do PHP';
$wb['limit_client_error'] = 'O número máximo de clientes foi atingido.';
$wb['limit_client_error_positive'] = 'O número de clientes precisa ser > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'O número de clientes precisa ser > 0';
$wb['limit_web_quota_txt'] = 'Cota Web';
$wb['limit_traffic_quota_txt'] = 'Cota de Tráfego';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
......
......@@ -89,7 +89,7 @@ $wb['template_additional_txt'] = 'Addon template';
$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
$wb['web_php_options_txt'] = 'PHP Options';
$wb['limit_client_error'] = 'The max. number of clients is reached.';
$wb['limit_client_error_positive'] = 'The number of clients must be > 0';
$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0';
$wb['limit_web_quota_txt'] = 'Web Quota';
$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment