From d5cf65e7d10bc3ee03ce2cef0cdb2b4d72404c69 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 20:57:07 -0400
Subject: [PATCH] Minor interface tidyup
---
interface/lib/config.inc.php | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index ad377a7..efe42f9 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -27,7 +27,7 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-error_reporting(E_ALL|E_STRICT);
+error_reporting(E_ALL|E_NOTICE);
header('Pragma: no-cache');
header('Cache-Control: no-store, no-cache, max-age=0, must-revalidate');
@@ -40,7 +40,9 @@
$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns';
-//** Future Code - pedro - rfc
+//********************************************************************************
+//** 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.
@@ -82,8 +84,30 @@
$conf['db_database'] = 'ispconfig3';
}
+/* Dynamic constants are another technique as well as key files as constants.
+ The base root directory is the interface/ directory which is the top level for php
+ From this eveything else is be defined underneath as constants
+ The constants are directory paths with no trailing /
+ This should do away with the $conf['rootpath'] etc
+ The $conf['fs_div'] is unnecessary if only / is used, will work on windoze also
+
+*/
+//** The main ROOT is the parent directory to this file, ie interface
+define('ISPC_ROOT', realpath('../'));
+define('ISPC_CLASS_PATH', ISPC_ROOT.'/lib/classes');
+define('ISPC_TEMP_PATH', ISPC_ROOT.'/temp');
+define('ISPC_CACHE_PATH', ISPC_ROOT.'/cache');
+//<< End pedro rfc block
-//** Path Settings (Do not change!)
+//** Database Settings
+/* See above
+$conf['db_type'] = 'mysql';
+$conf['db_host'] = 'localhost';
+$conf['db_user'] = 'root';
+$conf['db_password'] = '';
+$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['classpath'] = $conf['rootpath'].$conf['fs_div'].'lib'.$conf['fs_div'].'classes';
@@ -96,7 +120,7 @@
define('INCLUDE_ROOT', SERVER_ROOT.DIR_TRENNER.'lib');
define('CLASSES_ROOT', INCLUDE_ROOT.DIR_TRENNER.'classes');
-/* pedro notes ? this stuff is REALLY not necessay */
+/* pedro notes ? this stuff is REALLY not necessay, can leak everywhere */
define('DB_TYPE', $conf['db_type']);
define('DB_HOST', $conf['db_host']);
define('DB_DATABASE',$conf['db_database']);
--
Gitblit v1.9.1