Rewrites/fixes for handling config entries in SQLs

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

diff --git a/inc/config-global.php b/inc/config-global.php
index b7e81697432905203c2f5f9b6fd28e095bbc29db..5c7110578e241ebc638aeb25186304574552e6e3 100644 (file)
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -61,11 +62,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
@@ -87,7 +91,7 @@ setConfigEntry('AUTHOR' , 'Roland Häder');
 setConfigEntry('TITLE', 'Mailer Project');
 
 // CFG: COPY
-setConfigEntry('COPY', 'Copyright © 2003 - 2009, by Roland Häder');
+setConfigEntry('COPY', 'Copyright &copy; 2003 - 2009, by Roland H&auml;der,<br />2009, 2010 by Mailer Developer Team');
 
 // CFG: CACHE-PATH
 setConfigEntry('CACHE_PATH', getConfig('PATH') . 'inc/cache/');