From 2a704f6cfc90c5cb0c037bffea0f70cad358a829 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 29 Jun 2010 06:54:09 -0400
Subject: [PATCH] Implemented: FS#891 - Email Forward check box to Leave a copy.
---
install/tpl/config.inc.php.master | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 965ed3e..68fd74f 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,6 +1,6 @@
<?php
/*
-Copyright (c) 2008, Till Brehm, Falko Timme, projektfarm Gmbh
+Copyright (c) 2007 - 2010, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -33,14 +33,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']) || isset($_REQUEST['s']) || isset($_REQUEST['s_old']) || isset($_REQUEST['conf'])) {
+ die('Internal Error: var override attempt detected');
+ exit;
+ }
}
+//** Set a few php.ini values
+if(get_magic_quotes_runtime()) set_magic_quotes_runtime(false);
+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.2.1');
//** Database
@@ -57,6 +73,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
@@ -83,13 +107,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');
+$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools';
//** Logging
@@ -108,7 +132,8 @@
//** Default Language
-$conf["language"] = 'en';
+$conf["language"] = '{language}';
+$conf["debug_language"] = false;
//** Misc.
@@ -125,4 +150,9 @@
define("LOGLEVEL_WARN",1);
define("LOGLEVEL_ERROR",2);
-?>
\ No newline at end of file
+//** include a local config-file if there is one
+//** IMPORTANT!!!
+//** DO NOT MAKE A COPY OF THIS FILE AS LOCAL CONFIG-FILE
+//** USE A EMPTY FILE AND ONLY COPY THE SETTINGS IN IT, YOU NEED TO OVERRIDE
+if (is_file(dirname(__FILE__) . '/config.inc.local.php')) include_once 'config.inc.local.php';
+?>
--
Gitblit v1.9.1