From cdda6b98d785f103d9be6643a99a882c0d65b64c Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Sun, 21 Dec 2008 04:51:07 -0500
Subject: [PATCH] fix parse error
---
install/tpl/config.inc.php.master | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 965ed3e..21f2be1 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,6 +1,7 @@
<?php
+
/*
-Copyright (c) 2008, Till Brehm, Falko Timme, 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,
@@ -33,14 +34,30 @@
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);
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.8 beta');
+define('ISPC_APP_VERSION', '3.0.0.8');
//** Database
@@ -57,6 +74,14 @@
define("DB_USER",$conf["db_user"]);
define("DB_PASSWORD",$conf["db_password"]);
define("DB_CHARSET",$conf["db_charset"]);
+
+
+//** Database settings for the master DB. This setting is only used in multiserver setups
+$conf["dbmaster_type"] = 'mysql';
+$conf["dbmaster_host"] = '{mysql_master_server_host}';
+$conf["dbmaster_database"] = '{mysql_master_server_database}';
+$conf["dbmaster_user"] = '{mysql_master_server_ispconfig_user}';
+$conf["dbmaster_password"] = '{mysql_master_server_ispconfig_password}';
//** Paths
@@ -125,4 +150,4 @@
define("LOGLEVEL_WARN",1);
define("LOGLEVEL_ERROR",2);
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1