From f73bb61c04c2ab46b7d4950f604e6cf84a42d78c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 19 Aug 2007 09:29:20 -0400
Subject: [PATCH] Fixed a strict error in tform.inc.php and tform_actions.inc.php
---
interface/lib/config.inc.php | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index f2b334f..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,12 +40,14 @@
$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns';
-//** Future Code - pedro - rfc
-/* Database connection
- The only time paramaters are needed is to connect, otherwise its not needed
- variables "around" the application. ie Connected and done.
+//********************************************************************************
+//** 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['host'] = 'type';
+ $DB['engine'] = 'type';
$DB['host'] = 'ip';
$DB['user'] = 'me';
$DB['password'] = 'secret';
@@ -62,15 +64,10 @@
(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.
-
- $DB['type'] = 'mysql';
- $DB['host'] = 'localhost';
- $DB['database'] = 'ispconfig3';
- $DB['user'] = 'root';
- $DB['password'] = '';
*/
-//** Detect for local database setting or set and load default params
+//* 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'];
@@ -87,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';
@@ -101,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