Merge branch 'unlimited_clients' into 'master'

Unlimited clients

Allow unlimited clients for reseller

Author: Marius Cramer

interface/lib/classes/validate_reseller.inc.php

@@ -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 '';
 		}

interface/web/client/lib/lang/ar_reseller.lng

@@ -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.';

interface/web/client/lib/lang/bg_reseller.lng

@@ -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'] = 'Трафик квота трябва да е число';

interface/web/client/lib/lang/br_reseller.lng

@@ -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.';

interface/web/client/lib/lang/cz_reseller.lng

@@ -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.';

interface/web/client/lib/lang/de_reseller.lng

@@ -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.';

interface/web/client/lib/lang/el_reseller.lng

@@ -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'] = 'Το Όριο ταχύτητας πρέπει να είναι αριθμός.';

interface/web/client/lib/lang/en_reseller.lng

@@ -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.';

interface/web/client/lib/lang/es_reseller.lng

@@ -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.';

interface/web/client/lib/lang/fi_reseller.lng

@@ -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.';