From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.
---
install/tpl/config.inc.php.master | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 5bf2aed..2350f41 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,6 +1,6 @@
<?php
/*
-Copyright (c) 2007, Till Brehm, Falko Timme, projektfarm Gmbh
+Copyright (c) 2008, Till Brehm, Falko Timme, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -27,15 +27,46 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-Header("Pragma: no-cache");
-Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
-Header("Content-Type: text/html");
+//** Web-only
+if( !empty($_SERVER['DOCUMENT_ROOT']) ) {
-ini_set('register_globals',0);
+ Header("Pragma: no-cache");
+ Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
+ Header("Content-Type: text/html");
+
+ ini_set('register_globals',0);
+}
$conf["app_title"] = "ISPConfig";
$conf["app_version"] = "3.0.0";
-$conf["server_id"] = "1";
+$conf["modules_available"] = "admin,mail,sites,monitor,client,dns";
+
+//** Key paramaters
+define('ISPC_APP_TITLE', 'ISPConfig');
+$conf['app_title'] = 'ISPConfig';
+define('ISPC_APP_VERSION', '3.0.0');
+$conf['app_version'] = '3.0.0';
+$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns';
+
+//** The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
+define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../'));
+define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
+define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
+define('ISPC_WEB_PATH', ISPC_ROOT_PATH.'/web');
+define('ISPC_THEMES_PATH', ISPC_ROOT_PATH.'/web/themes');
+
+define('ISPC_WEB_TEMP_PATH', ISPC_WEB_PATH.'/temp'); // Path for downloads, accessible via browser
+define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
+
+//** Interface settings
+define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns');
+
+
+/*
+ Server variables
+*/
+
+$conf["server_id"] = "{server_id}";
/*
@@ -75,7 +106,7 @@
*/
$conf["log_file"] = $conf["rootpath"].$conf["fs_div"]."ispconfig.log";
-$conf["log_priority"] = 0; // 0 = Debug, 1 = Warning, 2 = Error
+$conf["log_priority"] = 2; // 0 = Debug, 1 = Warning, 2 = Error
/*
Themes
@@ -100,17 +131,8 @@
$conf["start_session"] = true;
/*
- DNS Settings
+ Constants
*/
-
-$conf["auto_create_ptr"] = 1; // Automatically create PTR records?
-$conf["default_ns"] = 'ns1.example.com.'; // must be set if $conf['auto_create_ptr'] is 1. Don't forget the trailing dot!
-$conf["default_mbox"] = 'admin.example.com.'; // Admin email address. Must be set if $conf['auto_create_ptr'] is 1. Replace "@" with ".". Don't forget the trailing dot!
-$conf["default_ttl"] = 86400;
-$conf["default_refresh"] = 28800;
-$conf["default_retry"] = 7200;
-$conf["default_expire"] = 604800;
-$conf["default_minimum_ttl"] = 86400;
define("LOGLEVEL_DEBUG",0);
define("LOGLEVEL_WARN",1);
--
Gitblit v1.9.1