Merge branch 'master' into 'master'

add missing wb-entry

See merge request !204

install/tpl/server.ini.master

@@ -115,6 +115,7 @@ bind_group=bind
 bind_zonefiles_dir=/etc/bind
 named_conf_path=/etc/bind/named.conf
 named_conf_local_path=/etc/bind/named.conf.local
+disable_bind_log=n
 
 [fastcgi]
 fastcgi_starter_path=/var/www/php-fcgi-scripts/[system_user]/

interface/web/admin/form/server_config.tform.php

@@ -1204,6 +1204,12 @@ $form["tabs"]['dns'] = array(
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'disable_bind_log' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		//#################################
 		// ENDE Datatable fields
 		//#################################

interface/web/admin/lib/lang/ar_server_config.lng

@@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>

interface/web/admin/lib/lang/ar_system_config.lng

@@ -72,4 +72,5 @@ $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
 $wb["company_name_txt"] = "Company Name for the page title";
+$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
 ?>

interface/web/admin/lib/lang/bg_server_config.lng

@@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>

interface/web/admin/lib/lang/bg_system_config.lng

@@ -72,4 +72,5 @@ $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
 $wb["company_name_txt"] = "Company Name for the page title";
+$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
 ?>

interface/web/admin/lib/lang/br_server_config.lng

@@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>

interface/web/admin/lib/lang/br_system_config.lng

@@ -72,4 +72,5 @@ $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
 $wb["company_name_txt"] = "Company Name for the page title";
+$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
 ?>

interface/web/admin/lib/lang/cz_server_config.lng

@@ -252,5 +252,6 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>
 

interface/web/admin/lib/lang/cz_system_config.lng

@@ -72,5 +72,6 @@ $wb['No'] = 'Ne';
 $wb['min_password_length_txt'] = 'Minimální délka hesla';
 $wb['min_password_strength_txt'] = 'Minimální síla hesla';
 $wb["company_name_txt"] = "Company Name for the page title";
+$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
 ?>
 

interface/web/admin/lib/lang/de_server_config.lng

@@ -265,4 +265,5 @@ $wb['php_ini_check_minutes_error_empty'] = 'Bitte geben Sie einen Wert an, wie o
 $wb['php_ini_check_minutes_info_txt'] = '0 = keine Prüfung';
 $wb['php_handler_txt'] = 'Standard-PHP-Handler';
 $wb['enable_spdy_txt'] = 'Stellt SPDY zur Verfügung';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>

interface/web/admin/lib/lang/el_server_config.lng

@@ -249,4 +249,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>

interface/web/admin/lib/lang/el_system_config.lng

@@ -72,4 +72,5 @@ $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
 $wb["company_name_txt"] = "Company Name for the page title";
+$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
 ?>

interface/web/admin/lib/lang/en_server_config.lng

@@ -280,4 +280,5 @@ $wb['xmpp_port_http_txt'] = 'HTTP';
 $wb['xmpp_port_https_txt'] = 'HTTPS';
 $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
 $wb['xmpp_port_bosh_txt'] = 'BOSH';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>

interface/web/admin/lib/lang/en_system_config.lng

@@ -80,4 +80,5 @@ $wb["default_dnsserver_txt"] = 'Default DNS Server';
 $wb["default_slave_dnsserver_txt"] = 'Default Secondary DNS Server';
 $wb["default_dbserver_txt"] = 'Default Database Server';
 $wb["company_name_txt"] = "Company Name for the page title";
+$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
 ?>

interface/web/admin/lib/lang/es_server_config.lng

@@ -252,4 +252,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>

interface/web/admin/lib/lang/es_system_config.lng

@@ -77,4 +77,5 @@ $wb['default_dnsserver_txt'] = 'Servidor DNS por defecto';
 $wb['default_slave_dnsserver_txt'] = 'Servidor DNS secundario por defecto';
 $wb['default_dbserver_txt'] = 'Servidor de bases de datos por defecto';
 $wb["company_name_txt"] = "Company Name for the page title";
+$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
 ?>

interface/web/admin/lib/lang/fi_server_config.lng

@@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>

interface/web/admin/lib/lang/fi_system_config.lng

@@ -72,4 +72,5 @@ $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
 $wb["company_name_txt"] = "Company Name for the page title";
+$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
 ?>

interface/web/admin/lib/lang/fr_server_config.lng

@@ -251,5 +251,6 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>