X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fconfig-global.php;h=88b1ea574111ce3891342fb2458f851c3f79ff5b;hb=840659bfdfe0d0cf891135382818cdc134bf6f2e;hp=cc8d5e111052a20622e12a1492b1fa392d70e724;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git

diff --git a/inc/config-global.php b/inc/config-global.php
index cc8d5e1110..88b1ea5741 100644
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/03/2009 *
- * ===============                              Last change: 04/03/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 04/03/2009 *
+ * ===================                          Last change: 04/03/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : config-global.php                                *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -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
 
@@ -56,16 +56,19 @@ 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));
 
-// Configuration include file
-foreach (array('config','wrapper','inc','stats') as $inc) {
-	require($PATH . 'inc/' . $inc . '-functions.php');
+// Some very important function includes
+foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'stats', 'http', 'xml', 'callback', 'referal') as $inc) {
+	include($path . 'inc/' . $inc . '-functions.php');
 } // END - foreach
 
-// Auto-detection... (patched by "Stelzi" aka. profi-concept, thanks again!)
-$URL = 'http://' . getenv('SERVER_NAME') . str_replace("\\", '/', dirname($_SERVER['PHP_SELF']));
+// General functions
+include($path . 'inc/functions.php');
+
+// Auto-detection of URL
+$URL = 'http://' . detectServerName() . str_replace("\\", '/', dirname($_SERVER['PHP_SELF']));
 while (substr($URL, -1, 1) == '/') { $URL = substr($URL, 0, -1); }
 
 // Initialize the configuration
@@ -74,8 +77,11 @@ initConfig();
 // CFG: HOST-URL (without trailing '/' !)
 setConfigEntry('URL', $URL);
 
+// CFG: DOMAIN-NAME (without trailing '/' !)
+setConfigEntry('DOMAIN', detectDomainName());
+
 // CFG: SERVER-PATH
-setConfigEntry('PATH', $PATH);
+setConfigEntry('PATH', $path);
 
 // CFG: VERSION
 setConfigEntry('VERSION', 'v0.2.1');
@@ -84,18 +90,31 @@ setConfigEntry('VERSION', 'v0.2.1');
 setConfigEntry('AUTHOR' , 'Roland H&auml;der');
 
 // CFG: TITLE
-setConfigEntry('TITLE', 'MXChange - Mail Exchange');
+setConfigEntry('TITLE', 'Mailer-Project');
 
 // CFG: COPY
-setConfigEntry('COPY', 'Copyright &copy; 2003 - 2009, by Roland H&auml;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', 'inc/cache/');
+
+// 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');
+
+// CFG: SALT-LENGTH
+setConfigEntry('salt_length', 10);
 
-// CFG: CACHE-PATH
-setConfigEntry('CACHE_PATH', getConfig('PATH') . 'inc/cache/');
+// CFG: MINIMUM-ADMIN-PASS-LENGTH
+setConfigEntry('minium_admin_pass_length', 4);
 
-// CFG: STATS-ENABLED (performance impact, we use files now)
-setConfigEntry('STATS_ENABLED', 'N');
+// Remove maybe conflicting variables
+unset($url);
+unset($path);
 
-// Connect to the MySQL database...
+// Connect to the database...
 loadIncludeOnce('inc/mysql-connect.php');
 
 // Init stats system