diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 4f36055d3105be08e71e6c5b6827d22709dc0721..21f2be1cb49c7745a698ceeb9e5ebcd138dbb09c 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,7 +1,7 @@
 <?php
 
 /*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2008, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -34,10 +34,23 @@ if( !empty($_SERVER['DOCUMENT_ROOT']) ) {
 	Header("Pragma: no-cache");
 	Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
 	Header("Content-Type: text/html; charset=utf-8");
-
+	
+	//** Set a few php.ini values
 	ini_set('register_globals',0);
+	ini_set('magic_quotes_gpc', 0);
+	
+	if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
+		die('Internal Error: GLOBALS override attempt detected');
+		exit;
+	}
 }
 
+//** Set a few php.ini values
+set_magic_quotes_runtime(0);
+if(isset($app)) unset($app);
+if(isset($conf)) unset($conf);
+
+
 //** SVN Revision
 $svn_revision = '$Revision$';
 $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
diff --git a/server/plugins-available/network_settings_plugin.inc.php b/server/plugins-available/network_settings_plugin.inc.php
index 866e37cbe84c1b11638630cee0aaff9239ec0f81..53619b251be8d0350a0f63c16e13c776ad643891 100644
--- a/server/plugins-available/network_settings_plugin.inc.php
+++ b/server/plugins-available/network_settings_plugin.inc.php
@@ -122,6 +122,12 @@ class network_settings_plugin {
 			$app->log("Changed Network settings",LOGLEVEL_DEBUG);
 			
 			exec('/etc/init.d/networking force-reload');
+		} else {
+			if(is_file('/etc/debian_version')) {
+				$app->log("Network configuration disabled in server settings.",LOGLEVEL_WARN);
+			} else {
+				$app->log("Network configuration not available for this linux distribution.",LOGLEVEL_DEBUG);
+			}
 		}
 		
 	}