X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-global.php;h=8fa172f4313322aa60234e7c6f7bd1af91e682d1;hb=8f91aa447eca292e01bf9a072ad8d7b16e6a8142;hp=b7e81697432905203c2f5f9b6fd28e095bbc29db;hpb=b8a6f8012aa3509d8e0f8fd078e044f20e80707a;p=mailer.git

diff --git a/inc/config-global.php b/inc/config-global.php
index b7e8169743..8fa172f431 100644
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,8 +44,9 @@ if (!defined('__SECURITY')) {
  *      PLEASE DO NOT EDIT THE COMMENTS! install.php NEEDS THEM!        *
  ************************************************************************/
 
+// Proper function exists?
 if (function_exists('date_default_timezone_set')) {
-	// CFG: TIME-ZONE
+	// Set default timezone to Europe/Berlin (because I'm from Germany)
 	@date_default_timezone_set('Europe/Berlin');
 } // END - if
 
@@ -60,12 +60,15 @@ error_reporting(E_ALL | E_STRICT);
 $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');
+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');
+
 // 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
@@ -74,6 +77,9 @@ initConfig();
 // CFG: HOST-URL (without trailing '/' !)
 setConfigEntry('URL', $URL);
 
+// CFG: DOMAIN-NAME (without trailing '/' !)
+setConfigEntry('DOMAIN', detectDomainName());
+
 // CFG: SERVER-PATH
 setConfigEntry('PATH', $PATH);
 
@@ -87,18 +93,21 @@ 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 - 2011 by Mailer Developer Team');
 
-// CFG: CACHE-PATH
-setConfigEntry('CACHE_PATH', getConfig('PATH') . 'inc/cache/');
+// CFG: CACHE_PATH
+setConfigEntry('CACHE_PATH', 'inc/cache/');
 
-// CFG: STATS-ENABLED (temporary tables, if your database crashs all is gone)
-setConfigEntry('STATS_ENABLED', 'Y');
+// CFG: STATS-ENABLED (This setting is overwritten by ext-other; at least version 0.2.6)
+setConfigEntry('stats_enabled', 'N');
 
 // GLOBAL: DEBUG-TEMPLATE-CACHE
 setConfigEntry('DEBUG_TEMPLATE_CACHE', 'N');
 
-// Connect to the MySQL database...
+// CFG: SALT-LENGTH
+setConfigEntry('salt_length', 10);
+
+// Connect to the database...
 loadIncludeOnce('inc/mysql-connect.php');
 
 // Init stats system