From fb66b7870bce2b5f04cbaee82042b016b0de46b5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 17 Dec 2008 08:05:19 -0500
Subject: [PATCH] - Added Warning message when network configuration is disabled. - Added some general php settings to config.inc.php
---
install/tpl/config.inc.php.master | 17 +++++++++++++++--
server/plugins-available/network_settings_plugin.inc.php | 6 ++++++
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 4f36055..21f2be1 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 @@
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 866e37c..53619b2 100644
--- a/server/plugins-available/network_settings_plugin.inc.php
+++ b/server/plugins-available/network_settings_plugin.inc.php
@@ -122,6 +122,12 @@
$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);
+ }
}
}
--
Gitblit v1.9.1