Merge branch 'db_remote-DNS_Slave_Fix' into 'stable-3.1'

Till Brehm · Till Brehm · commit 3931f36e2fbd · 2020-07-23T14:49:42.000+02:00
Db remote server &amp; dns slave fix

See merge request ispconfig/ispconfig3!863
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
@@ -200,6 +200,25 @@
 			'value'  => '',
 			'name'  => 'default_dbserver'
 		),
+		'disable_client_remote_dbserver' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+        'default_remote_dbserver' => array (
+			'datatype'  => 'TEXT',
+			'formtype'  => 'TEXT',
+			'validators'  => array (  0 => array (  'type' => 'CUSTOM',
+				'class' => 'validate_database',
+				'function' => 'valid_ip_list',
+				'errmsg' => 'database_remote_error_ips'),
+			),
+			'default' => '',
+			'value'   => '',
+			'width'   => '60',
+			'searchable' => 2
+        ),
 		'web_php_options' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOXARRAY',
@@ -777,4 +796,3 @@
 	)
 );
 
-?>
diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng
@@ -84,6 +84,8 @@ $wb['reseller_can_use_options_txt'] = 'Revendas podem utilizar o menu sites';
 $wb['custom_login_text_txt'] = 'Texto personalizado para a página de acesso';
 $wb['custom_login_link_txt'] = 'Link personalizado para página de acesso';
 $wb['login_link_error_regex'] = 'Link personalizado para acesso inválido';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Nome';
 $wb['ca_issue_txt'] = 'Questão';
 $wb['ca_wildcard_txt'] = 'Usar curingas';
diff --git a/interface/web/admin/lib/lang/ca_system_config.lng b/interface/web/admin/lib/lang/ca_system_config.lng
@@ -84,6 +84,8 @@ $wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websi
 $wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
 $wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
 $wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -84,6 +84,8 @@ $wb['reseller_can_use_options_txt'] = 'Distributor (prodejce) může použít ka
 $wb['custom_login_text_txt'] = 'Vlastní text na přihlašovací stránce';
 $wb['custom_login_link_txt'] = 'Vlastní odkaz (URL) na přihlašovací stránce (vlastní text)';
 $wb['login_link_error_regex'] = 'Neplatný formát URL pro vlastní odkaz na přihlašovací stránce';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Název vydavatele';
 $wb['ca_issue_txt'] = 'Doména vydavatele';
 $wb['ca_wildcard_txt'] = 'Použít Wildcard (*)';
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
@@ -88,6 +88,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Wildcard verwenden';
diff --git a/interface/web/admin/lib/lang/dk_system_config.lng b/interface/web/admin/lib/lang/dk_system_config.lng
@@ -84,6 +84,8 @@ $wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websi
 $wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
 $wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
 $wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
@@ -91,6 +91,8 @@ $wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websi
 $wb["custom_login_text_txt"] = "Custom Text on Login-Page";
 $wb["custom_login_link_txt"] = "Custom Link on Login-Page";
 $wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng
@@ -84,6 +84,8 @@ $wb['webftp_url_txt'] = 'Enlace al cliente FTP por web';
 $wb['webmail_url_error_regex'] = 'Dirección del correo web inválida';
 $wb['webmail_url_note_txt'] = 'Marcador de posición:';
 $wb['webmail_url_txt'] = 'URL de correo web';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -84,6 +84,8 @@ $wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websi
 $wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
 $wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
 $wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
@@ -84,6 +84,8 @@ $wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websi
 $wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
 $wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
 $wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb["default_remote_dbserver_txt"] = "DB remoti predefiniti";
+$wb["disable_client_remote_dbserver_txt"] = "Disabilita la configurazione dei DB Remoti per i clienti";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Web-сервер по умолчанию';
 $wb['default_dnsserver_txt'] = 'DNS-сервер по умолчанию';
 $wb['default_slave_dnsserver_txt'] = 'Вторичный DNS-сервер по умолчанию';
 $wb['default_dbserver_txt'] = 'Сервер базы данных по умолчанию';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng
@@ -84,6 +84,8 @@ $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['default_dnsserver_txt'] = 'Default DNS Server';
 $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
 $wb['default_dbserver_txt'] = 'Default Database Server';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 $wb['ca_name_txt'] = 'Name';
 $wb['ca_issue_txt'] = 'Issue';
 $wb['ca_wildcard_txt'] = 'Use Wildcard';
diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng
@@ -87,4 +87,6 @@ $wb['reseller_can_use_options_txt'] = 'Bayi web siteleri için seçenek sekmesin
 $wb['custom_login_text_txt'] = 'Oturum Açma Sayfası Metni';
 $wb['custom_login_link_txt'] = 'Oturum Açma Sayfası Bağlantısı';
 $wb['login_link_error_regex'] = 'Oturum Açma Bağlantısı Geçersiz';
+$wb["default_remote_dbserver_txt"] = "Default DB Remote servers";
+$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients";
 ?>
diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm
@@ -74,7 +74,18 @@
                     {tmpl_var name='default_dbserver'}
                 </select></div>
             </div>
-            
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='disable_client_remote_dbserver_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='disable_client_remote_dbserver'}
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="default_remote_dbserver" class="col-sm-3 control-label">{tmpl_var name='default_remote_dbserver_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="default_remote_dbserver" id="default_remote_dbserver" value="{tmpl_var name='default_remote_dbserver'}" class="form-control" /></div>
+	    </div>
+ 
+         	
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
             
         <div class="clear"><div class="right">
diff --git a/interface/web/dns/lib/module.conf.php b/interface/web/dns/lib/module.conf.php
@@ -1,5 +1,7 @@
 <?php
 
+$userid=$app->auth->get_user_id();
+
 $module["name"]   = "dns";
 $module["title"]   = "top_menu_dns";
 $module["template"]  = "module.tpl.htm";
@@ -56,19 +58,23 @@
 
 unset($items);
 
-$items[] = array( 'title'  => "Secondary Zones",
-	'target'  => 'content',
-	'link' => 'dns/dns_slave_list.php',
-	'html_id' => 'dns_slave_list');
-
-$module["nav"][] = array( 'title' => 'Secondary DNS',
-	'open'  => 1,
-	'items' => $items);
+if($app->auth->get_client_limit($userid, 'dns_slave_zone') != 0)
+{
+	$items[] = array( 'title'  => "Secondary Zones",
+		'target'  => 'content',
+		'link' => 'dns/dns_slave_list.php',
+		'html_id' => 'dns_slave_list');
+
+	$module["nav"][] = array( 'title' => 'Secondary DNS',
+		'open'  => 1,
+		'items' => $items);
+	
+	unset($items);
+}
 
-unset($items);
 
 
 
 
 
-?>
+?>
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
@@ -152,6 +152,12 @@ function onShowEnd() {
 			$app->tpl->setVar("database_name_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_name_prefix'], $dbname_prefix, $global_config['dbname_prefix']), true);
 		}
 
+		if($global_config['disable_client_remote_dbserver'] == 'y' && $_SESSION["s"]["user"]["typ"] != 'admin') {
+			$app->tpl->setVar("disable_remote_db", 1);
+		} else {
+			$app->tpl->setVar("disable_remote_db", 0);
+		}
+
 		if($this->id > 0) {
 			//* we are editing a existing record
 			$edit_disabled = @($_SESSION["s"]["user"]["typ"] == 'admin')? 0 : 1; //* admin can change the database-name
@@ -351,16 +357,22 @@ function onBeforeUpdate() {
 		if($tmp['server_id'] && $tmp['server_id'] != $this->dataRecord['server_id']) {
 			// we need remote access rights for this server, so get it's ip address
 			$server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
+			
+			// Add default remote_ips from Main Configuration.
+			$remote_ips = explode(",", $global_config['default_remote_dbserver']);
+			if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }
+
 			if($server_config['ip_address']!='') {
 				if($this->dataRecord['remote_access'] != 'y'){
-					$this->dataRecord['remote_ips'] = $server_config['ip_address'];
+					$this->dataRecord['remote_ips'] = implode(',', $remote_ips);
 					$this->dataRecord['remote_access'] = 'y';
 				} else {
 					if($this->dataRecord['remote_ips'] != ''){
 						if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
 							$this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
 						}
 						$tmp = preg_split('/\s*,\s*/', $this->dataRecord['remote_ips']);
+						$tmp = array_merge($tmp, $remote_ips);
 						$tmp = array_unique($tmp);
 						$this->dataRecord['remote_ips'] = implode(',', $tmp);
 						unset($tmp);
@@ -430,16 +442,22 @@ function onBeforeInsert() {
 		if($tmp['server_id'] && $tmp['server_id'] != $this->dataRecord['server_id']) {
 			// we need remote access rights for this server, so get it's ip address
 			$server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
+			
+			// Add default remote_ips from Main Configuration.
+			$remote_ips = explode(",", $global_config['default_remote_dbserver']);
+			if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }
+
 			if($server_config['ip_address']!='') {
 				if($this->dataRecord['remote_access'] != 'y'){
-					$this->dataRecord['remote_ips'] = $server_config['ip_address'];
+					$this->dataRecord['remote_ips'] = implode(',', $remote_ips);
 					$this->dataRecord['remote_access'] = 'y';
 				} else {
 					if($this->dataRecord['remote_ips'] != ''){
 						if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
 							$this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
 						}
 						$tmp = preg_split('/\s*,\s*/', $this->dataRecord['remote_ips']);
+						$tmp = array_merge($tmp, $remote_ips);
 						$tmp = array_unique($tmp);
 						$this->dataRecord['remote_ips'] = implode(',', $tmp);
 						unset($tmp);
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
@@ -90,6 +90,7 @@
                         </select></div>
                 </tmpl_if>
             </div>
+	 <tmpl_unless name="disable_remote_db">
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='remote_access_txt'}</label>
                 <div class="col-sm-9">
@@ -99,6 +100,7 @@
             <div class="form-group">
                 <label for="remote_ips" class="col-sm-3 control-label">{tmpl_var name='remote_ips_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="remote_ips" id="remote_ips" value="{tmpl_var name='remote_ips'}" class="form-control" /></div></div>
+	 </tmpl_if>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
