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 | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index c52214e..68fd74f 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,7 +1,6 @@
<?php
-
/*
-Copyright (c) 2007 - 2009, Till Brehm, 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,
@@ -46,7 +45,7 @@
}
//** 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 +56,7 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.1.6');
+define('ISPC_APP_VERSION', '3.0.2.1');
//** Database
@@ -109,12 +108,12 @@
$conf['app_title'] = ISPC_APP_TITLE;
$conf['app_version'] = ISPC_APP_VERSION;
$conf['app_link'] = 'http://www.ispconfig.org/';
-$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help';
+$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
@@ -134,6 +133,7 @@
//** Default Language
$conf["language"] = '{language}';
+$conf["debug_language"] = false;
//** Misc.
@@ -150,4 +150,9 @@
define("LOGLEVEL_WARN",1);
define("LOGLEVEL_ERROR",2);
+//** 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