From f2ea1ac2223dd3c86abe2d41f96b58ea30f8fe61 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Oct 2009 12:02:32 -0400
Subject: [PATCH] Added: FS#696 - Make the allow override settings configurable per server and website
---
install/tpl/config.inc.php.master | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index b38390c..1935b9a 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -39,8 +39,8 @@
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');
+ if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']) || isset($_REQUEST['s']) || isset($_REQUEST['s_old']) || isset($_REQUEST['conf'])) {
+ die('Internal Error: var override attempt detected');
exit;
}
}
@@ -57,7 +57,7 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.0.9');
+define('ISPC_APP_VERSION', '3.0.1.5');
//** Database
@@ -133,7 +133,7 @@
//** Default Language
-$conf["language"] = 'en';
+$conf["language"] = '{language}';
//** Misc.
--
Gitblit v1.9.1