diff --git a/interface/web/dns/lib/module.conf.php b/interface/web/dns/lib/module.conf.php
index 75b17a98e8d975871418da2f4a8655f3b5d3aacc..4e4c6454708ba56f3b7aad22324514d98cfe093d 100644
--- a/interface/web/dns/lib/module.conf.php
+++ b/interface/web/dns/lib/module.conf.php
@@ -1,5 +1,7 @@
auth->get_user_id();
+
$module["name"] = "dns";
$module["title"] = "top_menu_dns";
$module["template"] = "module.tpl.htm";
@@ -56,19 +58,23 @@ $module["nav"][] = array( 'title' => 'DNS',
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);
-?>
+?>
\ No newline at end of file
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index 71e5acaf27c120d8d332485e494de8af8fd1689a..22f3302c6c4213c5d822280c67d6386707a11e4e 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -152,6 +152,12 @@ class page_action extends tform_actions {
$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,9 +357,14 @@ class page_action extends tform_actions {
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'] != ''){
@@ -361,6 +372,7 @@ class page_action extends tform_actions {
$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,9 +442,14 @@ class page_action extends tform_actions {
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'] != ''){
@@ -440,6 +457,7 @@ class page_action extends tform_actions {
$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
index 290ae30a96e5a90293699d4caa7628ec4745b431..0d5be00130e26bab120e3be3f47b31a4f425bd8f 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -97,6 +97,7 @@