Some lost old templates rewritten to expression language

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

diff --git a/inc/config-global.php b/inc/config-global.php
index b7e81697432905203c2f5f9b6fd28e095bbc29db..a2069688dbee3baa754f1dc518c57b9ea9e81dc5 100644 (file)
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -61,11 +61,14 @@ $PATH = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3));
 
 // Some very important function includes
 foreach (array('config','wrapper','inc','stats') as $inc) {
-       require($PATH . 'inc/' . $inc . '-functions.php');
+       include($PATH . 'inc/' . $inc . '-functions.php');
 } // END - foreach
 
+// Own functions
+include($PATH.'inc/functions.php');
+
 // Auto-detection... (patched by "Stelzi" aka. profi-concept, thanks again!)
-$URL = 'http://' . getenv('SERVER_NAME') . str_replace("\\", '/', dirname($_SERVER['PHP_SELF']));
+$URL = 'http://' . detectServerName() . str_replace("\\", '/', dirname($_SERVER['PHP_SELF']));
 while (substr($URL, -1, 1) == '/') { $URL = substr($URL, 0, -1); }
 
 // Initialize the configuration