Several more constants rewritten to getConfig()

[mailer.git] / inc / config-global.php

diff --git a/inc/config-global.php b/inc/config-global.php
index a0a80c4478f692150e82d55b44bafe4460b71e19..1a74f7970f3654b3e97e8c800312c310b1d22b4d 100644 (file)
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -52,30 +52,47 @@ if (function_exists('date_default_timezone_set')) {
 } // END - if
 
 // CFG: ERROR_REPORTING
-@error_reporting(0);
+error_reporting(E_ALL | E_STRICT);
 
 // CFG: REGISTER-GLOBALS
 @import_request_variables('');
 
-// @TODO These constants should be rewritten
-define('VERSION', 'v0.2.1');
-define('AUTHOR' , 'Roland Häder');
-define('TITLE', 'MXChange - Mail Exchange');
-define('COPY', 'Copyright © 2003 - 2008, by Roland Häder');
+// Detect path
+$PATH = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3));
+
+// Configuration include file
+require($PATH . 'inc/config-functions.php');
+
+// Wrapper include file
+require($PATH . 'inc/wrapper-functions.php');
+
+// Initialize the configuration
+initConfig();
 
 // Auto-detection... (patched by "Stelzi" aka. profi-concept, thanks again!)
 $URL = 'http://' . getenv('SERVER_NAME') . str_replace("\\", '/', dirname($_SERVER['PHP_SELF']));
 while (substr($URL, -1, 1) == '/') { $URL = substr($URL, 0, -1); }
-$PATH = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3));
-
-// CFG: SERVER-PATH
-define('PATH', $PATH);
 
 // CFG: HOST-URL (without trailing '/' !)
-define('URL', $URL);
+setConfigEntry('URL', $URL);
+
+// CFG: SERVER-PATH
+setConfigEntry('PATH', str_replace("\\", '/', substr(dirname(__FILE__), 0, -3)));
 
 // Connect to the MySQL database...
-require(constant('PATH') . 'inc/mysql-connect.php');
+loadIncludeOnce('inc/mysql-connect.php');
+
+// CFG: VERSION
+setConfigEntry('VERSION', 'v0.2.1');
+
+// CFG: AUTHOR
+setConfigEntry('AUTHOR' , 'Roland Häder');
+
+// CFG: TITLE
+setConfigEntry('TITLE', 'MXChange - Mail Exchange');
+
+// CFG: COPY
+setConfigEntry('COPY', 'Copyright © 2003 - 2008, by Roland Häder');
 
 //
 ?>