Installation rewritten to use more EL code

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

diff --git a/inc/config-global.php b/inc/config-global.php
index e4ad94833692650e41b506abdc41d8bff93ee682..a2becbbc33a5cec7ff2c5c5fd53ada6df3739f0d 100644 (file)
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -56,16 +56,16 @@ error_reporting(E_ALL | E_STRICT);
 // CFG: REGISTER-GLOBALS
 @import_request_variables('');
 
-// Detect path
-$PATH = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3));
+// Detect path (without 'inc') and fix windozer paths
+$path = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3));
 
 // Some very important function includes
-foreach (array('config','wrapper','template','module','inc','stats','http') as $inc) {
-       include($PATH . 'inc/' . $inc . '-functions.php');
+foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'stats', 'http') as $inc) {
+       include($path . 'inc/' . $inc . '-functions.php');
 } // END - foreach
 
-// Own functions
-include($PATH . 'inc/functions.php');
+// General functions
+include($path . 'inc/functions.php');
 
 // Auto-detection... (patched by "Stelzi" aka. profi-concept, thanks again!)
 $URL = 'http://' . detectServerName() . str_replace("\\", '/', dirname($_SERVER['PHP_SELF']));
@@ -81,7 +81,7 @@ setConfigEntry('URL', $URL);
 setConfigEntry('DOMAIN', detectDomainName());
 
 // CFG: SERVER-PATH
-setConfigEntry('PATH', $PATH);
+setConfigEntry('PATH', $path);
 
 // CFG: VERSION
 setConfigEntry('VERSION', 'v0.2.1');
@@ -110,6 +110,10 @@ setConfigEntry('salt_length', 10);
 // CFG: MINIMUM-ADMIN-PASS-LENGTH
 setConfigEntry('minium_admin_pass_length', 4);
 
+// Remove maybe conflicting variables
+unset($url);
+unset($path);
+
 // Connect to the database...
 loadIncludeOnce('inc/mysql-connect.php');