From 0cb35d04c15e4e533dfdc98a073f76b875d64977 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 12 Apr 2010 10:23:47 -0400
Subject: [PATCH] 

---
 install/tpl/config.inc.php.master |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 21f2be1..d2f0dac 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,7 +1,7 @@
 <?php
 
 /*
-Copyright (c) 2007 - 2008, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -39,14 +39,14 @@
 	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;
 	}
 }
 
 //** Set a few php.ini values
-set_magic_quotes_runtime(0);
+if(get_magic_quotes_runtime()) set_magic_quotes_runtime(false);
 if(isset($app)) unset($app);
 if(isset($conf)) unset($conf);
 
@@ -57,7 +57,7 @@
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.0.8');
+define('ISPC_APP_VERSION', '3.0.2.1');
 
 
 //** Database
@@ -108,7 +108,7 @@
 //** Server
 $conf['app_title'] = ISPC_APP_TITLE;
 $conf['app_version'] = ISPC_APP_VERSION;
-$conf['app_link'] = 'http://www.howtoforge.com/forums/showthread.php?t=26988';
+$conf['app_link'] = 'http://www.ispconfig.org/';
 $conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help';
 $conf["server_id"] = "{server_id}";
 
@@ -133,7 +133,8 @@
 
 
 //** Default Language
-$conf["language"] = 'en';
+$conf["language"] = '{language}';
+$conf["debug_language"] = false;
 
 
 //** Misc.

--
Gitblit v1.9.1