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 | 149 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 96 insertions(+), 53 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 6adc177..0d54ddd 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -1,6 +1,6 @@
<?php
/*
-Copyright (c) 2005, Till Brehm, Falko Timme, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, Falko Timme, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -27,73 +27,116 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-ini_set('register_globals',0);
+error_reporting(E_ALL|E_NOTICE);
-$conf["app_title"] = "ISPConfig";
-$conf["app_version"] = "3.0.0";
+header('Pragma: no-cache');
+header('Cache-Control: no-store, no-cache, max-age=0, must-revalidate');
+header('Content-Type: text/html');
+//* TODO: Js caching - pedro
-//$conf["rootpath"] = "F:\\server\\www\\ispconfig3\\interface";
-$conf["rootpath"] = "D:\\www\\ispconfig3\\interface";
-//$conf["rootpath"] = "/home/www/ispconfig3/web/cms";
+//** 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';
-$conf["fs_div"] = "\\"; // File system divider, \\ on windows and / on linux and unix
-$conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes";
-$conf["temppath"] = $conf["rootpath"].$conf["fs_div"]."temp";
+//** 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');
-/*
- Database Settings
+define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns');
+
+//********************************************************************************
+//** Future Code idea - pedro - rfc
+//** >>>>
+/* Database connection
+ The only time paramaters are needed is to connect, otherwise the variables
+ are not required "around" the application. ie Connected and done.
+ Prefered is an array as $DB in capitals, ie
+ $DB['engine'] = 'type';
+ $DB['host'] = 'ip';
+ $DB['user'] = 'me';
+ $DB['password'] = 'secret';
+ $DB['database'] = 'db_name';
+
+ The connection paramaters are all contained within one array structure
+ With this array structure the connection can be passed around, to functions
+ However it can also leak so it can be destroyed eg
+ $dbClass->connect($DB);
+ unset($DB); // only the paranoid survive
+
+ Also there is a scenario where we are devloping and using this file
+ and the database paramaters might leak into svn etc.
+ (This idea is borrowed from the tikiwiki.org project)
+ To resolve this there is a file called db_local.php.skel which is not detected
+ rename this to db_local.php and edit the paramaters.
+*/
+
+//* Detect the local database settings ie $DB array()
+//* Copy db_local.php.skel for and change for local development
+if(file_exists(dirname(__FILE__).'/db_local.php')){
+ require_once(dirname(__FILE__).'/db_local.php');
+ $conf['db_type'] = $DB['type'];
+ $conf['db_host'] = $DB['host'];
+ $conf['db_user'] = $DB['user'];
+ $conf['db_password'] = $DB['password'];
+ $conf['db_database'] = $DB['database'];
+}else{
+ //** Database Settings
+ $conf['db_type'] = 'mysql';
+ $conf['db_host'] = 'localhost';
+ $conf['db_user'] = 'root';
+ $conf['db_password'] = '';
+ $conf['db_database'] = 'ispconfig3';
+}
+
+//** Database Settings
+/* See above
+$conf['db_type'] = 'mysql';
+$conf['db_host'] = 'localhost';
+$conf['db_user'] = 'root';
+$conf['db_password'] = '';
+$conf['db_database'] = 'ispconfig3';
*/
-$conf["db_type"] = 'mysql';
-$conf["db_host"] = 'localhost';
-$conf["db_database"] = 'ispconfig3';
-$conf["db_user"] = 'root';
-$conf["db_password"] = '';
-
-
-/*
- External programs
-*/
-
+//** 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
-*/
+//** Themes
+$conf['theme'] = 'default';
+$conf['html_content_encoding'] = 'text/html; charset=iso-8859-1';
+$conf['logo'] = 'themes/default/images/mydnsconfig_logo.gif';
-$conf["theme"] = 'default';
-$conf["html_content_encoding"] = 'text/html; charset=iso-8859-1';
-$conf["logo"] = 'themes/default/images/mydnsconfig_logo.gif';
+//** Default Language
+$conf['language'] = 'en';
-/*
- Default Language
-*/
-
-$conf["language"] = 'en';
+//** Auto Load Modules
+$conf['start_db'] = true;
+$conf['start_session'] = true;
-/*
- Auto Load Modules
-*/
+//** DNS Settings
-$conf["start_db"] = true;
-$conf["start_session"] = true;
-
-/*
- DNS Settings
-*/
-
-$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;
+//* Automatically create PTR records?
+$conf['auto_create_ptr'] = 1;
+//* must be set if $conf['auto_create_ptr'] is 1. Don't forget the trailing dot!
+$conf['default_ns'] = 'ns1.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_mbox'] = 'admin.example.com.';
+$conf['default_ttl'] = 86400;
+$conf['default_refresh'] = 28800;
+$conf['default_retry'] = 7200;
+$conf['default_expire'] = 604800;
+$conf['default_minimum_ttl'] = 86400;
?>
\ No newline at end of file
--
Gitblit v1.9.1