From dcff5718f345f55f7ea81f18d1f086facde4eacf Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Mon, 20 Aug 2007 23:14:51 -0400
Subject: [PATCH] * Using new ISPC_*_PATH constants * Adding new data schema (to be moved shortly * no more $conf['classpath']
---
interface/lib/config.inc.php | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index efe42f9..e5d155a 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -35,7 +35,9 @@
//* TODO: Js caching - pedro
//** 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';
@@ -84,20 +86,14 @@
$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
+
+//** 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
@@ -110,23 +106,19 @@
$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';
$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';
-define('DIR_TRENNER', $conf['fs_div']);
-define('SERVER_ROOT', $conf['rootpath']);
-define('INCLUDE_ROOT', SERVER_ROOT.DIR_TRENNER.'lib');
-define('CLASSES_ROOT', INCLUDE_ROOT.DIR_TRENNER.'classes');
-/* pedro notes ? this stuff is REALLY not necessay, can leak everywhere */
+/* 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";
--
Gitblit v1.9.1