From 6dfc1f8aef2d75f5ca8fe694fb8ef27ef885b12c Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Sat, 01 May 2010 18:15:28 -0400
Subject: [PATCH] Added a new module called "domain". With this module you can manage all domains (web + mail). Per default this module is not active. To activate it, you have to change the System Interface Config -> domains -> use the domain module. You also have to activate the domain-module for the admin (and for every client if you want). Important: you can not use this module if you have reseller!

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

diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index e250863..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
@@ -133,7 +133,8 @@
 
 
 //** Default Language
-$conf["language"] = 'en';
+$conf["language"] = '{language}';
+$conf["debug_language"] = false;
 
 
 //** Misc.

--
Gitblit v1.9.1