From 6fa4b7b8bb1cd2bfc75751fb076683d4a7fd4b67 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Tue, 21 Aug 2007 00:28:16 -0400
Subject: [PATCH] Minor code tidy
---
interface/lib/config.inc.php | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index ad377a7..289f578 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');
@@ -35,12 +35,16 @@
//* 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';
-//** 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.
@@ -83,30 +87,42 @@
}
-//** Path Settings (Do not change!)
-$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';
+//** 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('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');
+define('ISPC_TEMP_PATH', ISPC_ROOT_PATH.'/temp');
+define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
-/* pedro notes ? this stuff is REALLY not necessay */
+
+//** Database Settings
+/* See above
+$conf['db_type'] = 'mysql';
+$conf['db_host'] = 'localhost';
+$conf['db_user'] = 'root';
+$conf['db_password'] = '';
+$conf['db_database'] = 'ispconfig3';
+*/
+
+
+$conf['cache_dir'] = ISPC_ROOT_PATH.'/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