interface/web/client/form/client_circle.tform.php

@@ -112,10 +112,11 @@ $form["tabs"]['circle'] = array (
 			'default' => '',
 			'separator' => ',',
 			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT client_id,contact_name FROM client WHERE {AUTHSQL} ORDER BY contact_name',
+				'querystring' => 'SELECT client_id,CONCAT(company_name, " (",contact_firstname, " ", contact_name, ")") as contact_label FROM client WHERE {AUTHSQL} ORDER BY contact_label',
 				'keyfield'=> 'client_id',
-				'valuefield'=> 'contact_name'
+				'valuefield'=> 'contact_label'
 			),
+			'render_inline' => 'n',
 			'value'  => ''
 		),
 		'description' => array (

interface/web/client/form/client_template.tform.php

@@ -256,6 +256,20 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_mail_wblist' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'validators' => array (  0 => array ( 'type' => 'ISINT',
+					'errmsg'=> 'limit_mail_wblist_error_notint'),
+			),
+			'default' => '-1',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '10',
+			'rows'  => '',
+			'cols'  => ''
+		),
 		'limit_mailfilter' => array (
 			'datatype' => 'INTEGER',
 			'formtype' => 'TEXT',
@@ -339,7 +353,22 @@ $form["tabs"]['limits'] = array (
 			'maxlength' => '10',
 			'rows'  => '',
 			'cols'  => ''
-		),/*
+		),
+		'limit_mail_backup' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'valuelimit' => 'client:limit_mail_backup',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+		'limit_relayhost' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'valuelimit' => 'client:limit_relayhost',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+		/*
         'default_xmppserver' => array (
             'datatype' => 'INTEGER',
             'formtype' => 'SELECT',
@@ -401,42 +430,49 @@ $form["tabs"]['limits'] = array (
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
             'default' => 'n',
+			'valuelimit' => 'client:limit_xmpp_muc',
             'value'  => array(0 => 'n', 1 => 'y')
         ),
         'limit_xmpp_anon' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
             'default' => 'n',
+			'valuelimit' => 'client:limit_xmpp_anon',
             'value'  => array(0 => 'n', 1 => 'y')
         ),
         'limit_xmpp_vjud' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
             'default' => 'n',
+			'valuelimit' => 'client:limit_xmpp_vjud',
             'value'  => array(0 => 'n', 1 => 'y')
         ),
         'limit_xmpp_proxy' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
             'default' => 'n',
+			'valuelimit' => 'client:limit_xmpp_proxy',
             'value'  => array(0 => 'n', 1 => 'y')
         ),
         'limit_xmpp_status' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
             'default' => 'n',
+			'valuelimit' => 'client:limit_xmpp_status',
             'value'  => array(0 => 'n', 1 => 'y')
         ),
         'limit_xmpp_pastebin' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
             'default' => 'n',
+			'valuelimit' => 'client:limit_xmpp_pastebin',
             'value'  => array(0 => 'n', 1 => 'y')
         ),
         'limit_xmpp_httparchive' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
             'default' => 'n',
+			'valuelimit' => 'client:limit_xmpp_httparchive',
             'value'  => array(0 => 'n', 1 => 'y')
         ),/*
 		'default_webserver' => array (
@@ -495,67 +531,77 @@ $form["tabs"]['limits'] = array (
 			'formtype' => 'CHECKBOXARRAY',
 			'default' => '',
 			'separator' => ',',
-			'valuelimit' => 'client:web_php_options',
+			'valuelimit' => 'system:sites:web_php_options;client:web_php_options',
 			'value'  => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM')
 		),
 		'limit_cgi' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_cgi',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_ssi' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_ssi',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_perl' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_perl',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_ruby' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_ruby',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_python' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_python',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'force_suexec' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'y',
+			'valuelimit' => 'client:force_suexec',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_hterror' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_hterror',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_wildcard' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_wildcard',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_ssl' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_ssl',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_ssl_letsencrypt' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_ssl_letsencrypt',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_web_aliasdomain' => array (
@@ -646,12 +692,14 @@ $form["tabs"]['limits'] = array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'y',
+			'valuelimit' => 'client:limit_backup',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'limit_directive_snippets' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
 			'default' => 'n',
+			'valuelimit' => 'client:limit_directive_snippets',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),/*
 		'default_dnsserver' => array (
@@ -812,6 +860,20 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_database_postgresql' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'validators' => array (  0 => array ( 'type' => 'ISINT',
+					'errmsg'=> 'limit_database_error_notint'),
+			),
+			'default' => '-1',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '10',
+			'rows'  => '',
+			'cols'  => ''
+		),
 		'limit_cron' => array (
 			'datatype'  => 'INTEGER',
 			'formtype'  => 'TEXT',
@@ -830,6 +892,7 @@ $form["tabs"]['limits'] = array (
 			'datatype'  => 'VARCHAR',
 			'formtype'  => 'SELECT',
 			'default'   => '',
+			'valuelimit' => 'client:limit_cron_type',
 			'value'     => array('full' => 'Full Cron', 'chrooted' => 'Chrooted Cron', 'url' => 'URL Cron')
 		),
 		'limit_cron_frequency' => array (
@@ -883,6 +946,7 @@ $form["tabs"]['limits'] = array (
 				'keyfield'=> 'template_id',
 				'valuefield'=> 'template_name'
 			),
+			'valuelimit' => 'client:limit_openvz_vm_template_id',
 			'value'  => array(0 => ' ')
 		),
 		'limit_aps' => array (

interface/web/client/form/domain.tform.php

@@ -63,6 +63,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 $form["title"]    = "Domain";
 $form["description"]  = "";
 $form["name"]    = "domain";
+$form["record_name_field"] = "domain";
 $form["action"]   = "domain_edit.php";
 $form["db_table"]  = "domain";
 $form["db_table_idx"] = "domain_id";
@@ -100,16 +101,17 @@ $form["tabs"]['domain'] = array (
 				1 => array ( 'type' => 'UNIQUE',
 					'errmsg'=> 'domain_error_unique'),
 				2 => array ( 'type' => 'REGEX',
-					'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/',
+					'regex' => '/^[\w\.\-]{1,255}\.[a-zA-Z0-9\-]{2,63}$/',
 					'errmsg'=> 'domain_error_regex'),
 			),
 			'default' => '',
 			'value'  => '',
 			'width'  => '30',
-			'maxlength' => '255'
+			'maxlength' => '255',
+			'searchable' => 1,
 		),
 		//#################################
-		// ENDE Datatable fields
+		// END Datatable fields
 		//#################################
 	)
 );

interface/web/client/form/reseller.tform.php

@@ -41,11 +41,12 @@
 $form["title"]    = "Reseller";
 $form["description"]  = "";
 $form["name"]    = "reseller";
+$form["record_name_field"] = "username";
 $form["action"]   = "reseller_edit.php";
 $form["db_table"]  = "client";
 $form["db_table_idx"] = "client_id";
 $form["db_history"]  = "yes";
-$form["tab_default"] = "address";
+$form["tab_default"] = "info";
 $form["list_default"] = "reseller_list.php";
 $form["auth"]   = 'yes';
 
@@ -80,6 +81,12 @@ while ($file = @readdir($handle)) {
 	}
 }
 
+$form["tabs"]['info'] = array(
+	'title'  => "Info",
+	'width'  => 100,
+	'template'  => "templates/reseller_edit_info.htm",
+	'fields'  => array()
+);
 $form["tabs"]['address'] = array (
 	'title'  => "Address",
 	'width'  => 100,
@@ -411,7 +418,7 @@ $form["tabs"]['address'] = array (
 					1 => array( 'event' => 'SAVE',
 					'type' => 'STRIPNL')
 			),
-			'default' => 'http://',
+			'default' => 'https://',
 			'value'  => '',
 			'separator' => '',
 			'width'  => '30',
@@ -838,6 +845,20 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_mail_wblist' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'validators' => array (  0 => array ( 'type' => 'ISINT',
+					'errmsg'=> 'limit_mail_wblist_error_notint'),
+			),
+			'default' => '-1',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '10',
+			'rows'  => '',
+			'cols'  => ''
+		),
 		'limit_mailfilter' => array (
 			'datatype' => 'INTEGER',
 			'formtype' => 'TEXT',
@@ -922,6 +943,18 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_mail_backup' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+		'limit_relayhost' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
         'default_xmppserver' => array (
             'datatype' => 'INTEGER',
             'formtype' => 'SELECT',
@@ -1080,6 +1113,7 @@ $form["tabs"]['limits'] = array (
 		'web_php_options' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOXARRAY',
+			'valuelimit' => 'system:sites:web_php_options',
 			'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
 					'errmsg'=> 'web_php_options_notempty'),
 			),
@@ -1407,6 +1441,20 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_database_postgresql' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'validators' => array (  0 => array ( 'type' => 'ISINT',
+					'errmsg'=> 'limit_database_error_notint'),
+			),
+			'default' => '-1',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '10',
+			'rows'  => '',
+			'cols'  => ''
+		),
 		'limit_cron' => array (
 			'datatype'  => 'INTEGER',
 			'formtype'  => 'TEXT',
@@ -1559,7 +1607,7 @@ $form["tabs"]['ipaddress'] = array (
 			'separator'	=> ';'
 		),
 	##################################
-	# ENDE Datatable fields
+	# END Datatable fields
 	##################################
 	)
 );

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

@@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging';
 $wb['Send email'] = 'Send Email';
 $wb['Edit Client Circle'] = 'Edit Client Circle';
 $wb['Domains'] = 'Domains';
+$wb['Add Domain'] = 'Add Domain';
 $wb['domain_txt'] = 'Domain';
 $wb['client_txt'] = 'Client';
 $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';

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

@@ -6,12 +6,14 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
 $wb['contact_firstname_txt'] = 'Contact firstname';
@@ -37,6 +39,7 @@ $wb['company_txt'] = 'Company';
 $wb['title_txt'] = 'Title';
 $wb['firstname_txt'] = 'Firstname';
 $wb['surname_txt'] = 'Surname';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
@@ -68,6 +71,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must b
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -107,7 +111,7 @@ $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
 $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
 $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
 $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
-$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one option.';
 $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
 $wb['add_additional_template_txt'] = 'Add additional template';
 $wb['delete_additional_template_txt'] = 'Delete additional template';
@@ -146,7 +150,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
 $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
 $wb['canceled_txt'] = 'Canceled (disables client login)';
 $wb['gender_txt'] = 'Title';
 $wb['gender_m_txt'] = 'Mr.';
@@ -200,5 +204,6 @@ $wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
 $wb['limit_directive_snippets_txt'] = 'Show web server config selection';
 $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
+$wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
+$wb['language_error_empty'] = 'Language is empty.';

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

@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'This action will delete the following number of rec
 $wb['btn_save_txt'] = 'Delete the client';
 $wb['btn_cancel_txt'] = 'Cancel without deleting the client';
 $wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
 ?>

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

@@ -10,7 +10,7 @@ $wb['sender_invalid_error'] = 'Sender email invalid.';
 $wb['subject_invalid_error'] = 'Subject is empty.';
 $wb['message_invalid_error'] = 'Message is empty.';
 $wb['email_sent_to_txt'] = 'Email sent to:';
-$wb['page_head_txt'] = 'Send customer information';
+$wb['page_head_txt'] = 'Send email message to clients and resellers';
 $wb['recipient_txt'] = 'Recipient';
 $wb['all_clients_resellers_txt'] = 'All clients and resellers';
 $wb['all_clients_txt'] = 'All clients';

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

 <?php
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one option.';
 $wb['limit_client_error_notint'] = 'Client Limit is not a number.';
 $wb['limit_maildomain_txt'] = 'Max. number of email domains';
 $wb['limit_mailbox_txt'] = 'Max. number of mailboxes';
@@ -7,12 +8,14 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
@@ -36,6 +39,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must b
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -90,6 +94,7 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
@@ -121,4 +126,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>

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

@@ -3,4 +3,5 @@ $wb['list_head_txt'] = 'Client-Templates';
 $wb['template_type_txt'] = 'Type';
 $wb['template_name_txt'] = 'Template name';
 $wb['template_id_txt'] = 'Template ID';
+$wb['sys_groupid_txt'] = 'Reseller';
 ?>

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

@@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty';
 $wb['domain_error_unique'] = 'The domain already exists';
 $wb['domain_error_regex'] = 'This domain-name is not allowed';
 $wb['Domain'] = 'Domain';
+$wb['domain_txt'] = 'Domain';
 ?>

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

@@ -5,12 +5,14 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
 $wb['contact_firstname_txt'] = 'Contact firstname';
@@ -36,6 +38,7 @@ $wb['company_txt'] = 'Company';
 $wb['title_txt'] = 'Title';
 $wb['firstname_txt'] = 'Firstname';
 $wb['surname_txt'] = 'Surname';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
@@ -66,6 +69,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -107,7 +111,7 @@ $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
 $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
 $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
 $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
-$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one option.';
 $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
 $wb['add_additional_template_txt'] = 'Add additional template';
 $wb['delete_additional_template_txt'] = 'Delete additional template';
@@ -203,5 +207,6 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n
 $wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
 $wb['limit_directive_snippets_txt'] = 'Show web server config selection';
 $wb['password_click_to_set_txt'] = 'Click to set';
+$wb['Reseller'] = 'Reseller';
+$wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>

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

@@ -17,6 +17,7 @@ $wb['Messaging'] = 'Messaging';
 $wb['Send email'] = 'Send Email';
 $wb['Edit Client Circle'] = 'Edit Client Circle';
 $wb['Domains'] = 'Domains';
+$wb['Add Domain'] = 'Add Domain';
 $wb['domain_txt'] = 'Domain';
 $wb['client_txt'] = 'Client';
 $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';

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

@@ -5,12 +5,14 @@ $wb['limit_mailalias_txt'] = 'Макс. брой email aliases';
 $wb['limit_mailforward_txt'] = 'Макс. брой email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Макс. брой email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Макс. брой email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Макс. брой email filters';
 $wb['limit_fetchmail_txt'] = 'Макс. брой fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Размер на пощенските кутии';
 $wb['limit_spamfilter_wblist_txt'] = 'Макс. брой spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Макс. брой spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Макс. брой spamfilter policys';
+$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
 $wb['default_mailserver_txt'] = 'Пощенски сървър по подразбиране';
 $wb['company_name_txt'] = 'Компания';
 $wb['contact_firstname_txt'] = 'Contact firstname';
@@ -37,6 +39,7 @@ $wb['title_txt'] = 'Обръщение';
 $wb['firstname_txt'] = 'Име';
 $wb['surname_txt'] = 'Фамилия';
 $wb['limit_client_txt'] = 'Макс. брой клиенти';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
@@ -63,6 +66,7 @@ $wb['limit_mailalias_error_notint'] = ' The email alias трябва да е ч
 $wb['limit_mailforward_error_notint'] = 'The email forward трябва да е число';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall трябва да е число';
 $wb['limit_mailrouting_error_notint'] = 'The email routing трябва да е число';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter трябва да е число';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail трябва да е число';
 $wb['limit_mailquota_error_notint'] = 'Размерът на пощенските кутии трябва да е число.';
@@ -107,7 +111,7 @@ $wb['limit_openvz_vm_txt'] = 'Макс. брой на Виртуалните с
 $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
 $wb['limit_openvz_vm_error_notint'] = 'The virtual server трябва да е число';
 $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
-$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one option.';
 $wb['add_additional_template_txt'] = 'Add additional template';
 $wb['delete_additional_template_txt'] = 'Delete additional template';
 $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
@@ -146,7 +150,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
 $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
 $wb['canceled_txt'] = 'Canceled (disables client login)';
 $wb['gender_txt'] = 'Title';
 $wb['gender_m_txt'] = 'Mr.';
@@ -200,5 +204,6 @@ $wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
 $wb['limit_directive_snippets_txt'] = 'Show web server config selection';
 $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
+$wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
+$wb['language_error_empty'] = 'Language is empty.';

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

@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'This action will delete the following number of rec
 $wb['btn_save_txt'] = 'Изтрии клиента';
 $wb['btn_cancel_txt'] = 'Отказ, без изтриване на клиента';
 $wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
 ?>

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

@@ -10,7 +10,7 @@ $wb['sender_invalid_error'] = 'Sender email invalid.';
 $wb['subject_invalid_error'] = 'Полето с Тема е празно.';
 $wb['message_invalid_error'] = 'Полето с съобщение е празно.';
 $wb['email_sent_to_txt'] = 'Изпрати до:';
-$wb['page_head_txt'] = 'Send customer information';
+$wb['page_head_txt'] = 'Send email message to clients and resellers';
 $wb['recipient_txt'] = 'Recipient';
 $wb['all_clients_resellers_txt'] = 'All clients and resellers';
 $wb['all_clients_txt'] = 'All clients';

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

 <?php
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one option.';
 $wb['limit_client_error_notint'] = 'The sub client трябва да е число';
 $wb['limit_maildomain_txt'] = 'Макс. брой на емайл доменни';
 $wb['limit_mailbox_txt'] = 'Макс. брой на пощенски кутии';
@@ -6,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Макс. брой на email aliases';
 $wb['limit_mailforward_txt'] = 'Макс. брой на email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Макс. брой на email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Макс. брой на email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Макс. брой на email filters';
 $wb['limit_fetchmail_txt'] = 'Макс. брой на fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Квота на пощенската кутия';
@@ -13,6 +15,7 @@ $wb['limit_spamfilter_wblist_txt'] = 'Макс. брой на spamfilter white /
 $wb['limit_spamfilter_user_txt'] = 'Макс. брой на spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Макс. брой на spamfilter policys';
 $wb['limit_client_txt'] = 'Макс. брой на Клиентите';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
@@ -31,6 +34,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias трябва да е чи
 $wb['limit_mailforward_error_notint'] = 'The email forward трябва да е число';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall трябва да е число';
 $wb['limit_mailrouting_error_notint'] = 'The email routing трябва да е число';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter трябва да е число';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail трябва да е число';
 $wb['limit_mailquota_error_notint'] = 'The email quota трябва да е число';
@@ -90,6 +94,7 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
@@ -121,4 +126,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>

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

@@ -3,4 +3,5 @@ $wb['list_head_txt'] = 'Client-Templates';
 $wb['template_type_txt'] = 'Type';
 $wb['template_name_txt'] = 'Template name';
 $wb['template_id_txt'] = 'Template ID';
+$wb['sys_groupid_txt'] = 'Reseller';
 ?>

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

@@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Името на домейна е празно';
 $wb['domain_error_unique'] = 'Домейна съществува';
 $wb['domain_error_regex'] = 'Това име на домейн не е разрешен.';
 $wb['Domain'] = 'Домейн';
+$wb['domain_txt'] = 'Domain';
 ?>

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

@@ -5,12 +5,14 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Квота на пощенската кутия';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policys';
+$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
 $wb['default_mailserver_txt'] = 'Мейл сървър по подразбиране';
 $wb['company_name_txt'] = 'Име на компанията';
 $wb['contact_firstname_txt'] = 'Contact firstname';
@@ -36,6 +38,7 @@ $wb['company_txt'] = 'Компания';
 $wb['title_txt'] = 'Обръщение';
 $wb['firstname_txt'] = 'Първо име ';
 $wb['surname_txt'] = 'Фамилия';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
@@ -66,6 +69,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias трябва да е чи
 $wb['limit_mailforward_error_notint'] = 'The email forward трябва да е число';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall трябва да е число';
 $wb['limit_mailrouting_error_notint'] = 'The email routing трябва да е число';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter трябва да е число';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail трябва да е число';
 $wb['limit_mailquota_error_notint'] = 'The email quota трябва да е число';
@@ -107,7 +111,7 @@ $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
 $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
 $wb['limit_openvz_vm_error_notint'] = 'The virtual server трябва да е число';
 $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
-$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one option.';
 $wb['add_additional_template_txt'] = 'Add additional template';
 $wb['delete_additional_template_txt'] = 'Delete additional template';
 $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
@@ -203,5 +207,6 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n
 $wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available';
 $wb['limit_directive_snippets_txt'] = 'Show web server config selection';
 $wb['password_click_to_set_txt'] = 'Click to set';
+$wb['Reseller'] = 'Reseller';
+$wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>