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.
---
interface/lib/config.inc.php | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index e5d155a..0d54ddd 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -41,6 +41,17 @@
$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');
+
+define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns');
//********************************************************************************
//** Future Code idea - pedro - rfc
@@ -86,15 +97,6 @@
$conf['db_database'] = 'ispconfig3';
}
-
-//** 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_TEMP_PATH', ISPC_ROOT_PATH.'/temp');
-define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
-
-
//** Database Settings
/* See above
$conf['db_type'] = 'mysql';
@@ -104,25 +106,10 @@
$conf['db_database'] = 'ispconfig3';
*/
-$conf['rootpath'] = substr(dirname(__FILE__),0,-4);
-$conf['fs_div'] = '/'; // File system divider, \\ on windows and / on linux and unix
-$conf['temppath'] = $conf['rootpath'].$conf['fs_div'].'temp';
-// predro notes: not sure this is the right thing ?
-$conf['cache_dir'] = $conf['rootpath'].$conf['fs_div'].'/cache';
-
-
-/* pedro notes ? this stuff is REALLY not necessay, can leak everywhere
- Don think this lot is being used so commented out
-define('DB_TYPE', $conf['db_type']);
-define('DB_HOST', $conf['db_host']);
-define('DB_DATABASE',$conf['db_database']);
-define('DB_USER', $conf['db_user']);
-define('DB_PASSWORD', $conf['db_password']);
-*/
//** External programs
//$conf["programs"]["convert"] = "/usr/bin/convert";
-$conf['programs']['wput'] = $conf['rootpath']."\\tools\\wput\\wput.exe";
+$conf['programs']['wput'] = ISPC_ROOT_PATH."\\tools\\wput\\wput.exe";
//** Themes
--
Gitblit v1.9.1