From 24f38b424a3d12c7f4fac1829c83725b200b1e97 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Wed, 26 May 2010 05:42:11 -0400
Subject: [PATCH] Enhancement of the Website-List. The user can only select the server as filter, he has some sites at (and not ALL Servers of the server-farm)

---
 install/tpl/config.inc.php.master |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 21f2be1..c5a2d52 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,13 +108,13 @@
 //** 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['modules_available'] = 'admin,mail,sites,monitor,client,dns,help';
+$conf['app_link'] = 'http://www.ispconfig.org/';
+$conf['modules_available'] = 'dashboard,admin,mail,sites,monitor,client,dns,help';
 $conf["server_id"] = "{server_id}";
 
 
 //** Interface
-define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns,tools');
+define('ISPC_INTERFACE_MODULES_ENABLED', 'dashboard,mail,sites,dns,tools');
 
 
 //** Logging
@@ -133,7 +133,8 @@
 
 
 //** Default Language
-$conf["language"] = 'en';
+$conf["language"] = '{language}';
+$conf["debug_language"] = false;
 
 
 //** Misc.

--
Gitblit v1.9.1