From ecb6b3a8035679f652ed0d80ca624d8a0c6c57f1 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 22 Aug 2012 14:13:12 -0400
Subject: [PATCH] - Added database, database_user and vhost subdomain functions to the remoting - Added interface plugins for db and db users - changed remoting (splitted up insert, update and deletequery)

---
 server/plugins-available/network_settings_plugin.inc.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/server/plugins-available/network_settings_plugin.inc.php b/server/plugins-available/network_settings_plugin.inc.php
index 2bea300..b711139 100644
--- a/server/plugins-available/network_settings_plugin.inc.php
+++ b/server/plugins-available/network_settings_plugin.inc.php
@@ -239,7 +239,12 @@
 			}
 			
 		} else {
-			$app->log('Network configuration disabled in server settings or server is a mirror server.',LOGLEVEL_DEBUG);
+			if($data['mirrored'] == true) {
+				$app->log('Skipping network config request. IP addresses from amster are not configured on the mirror.',LOGLEVEL_DEBUG);
+			} 
+			if($server_config['auto_network_configuration'] == 'n') {
+				$app->log('Network configuration disabled in server settings.',LOGLEVEL_DEBUG);
+			}
 		}
 		
 	}

--
Gitblit v1.9.1