X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-global.php;h=1b40b2c9379df7f527654fa486ff4e7b29f9daca;hb=d6417790061e18fc1a9770ff93bb4e9d106b2f6e;hp=f3a26f6121c18c9719cb8acabb8e645c4a8e397b;hpb=ac293991d427918ec28531221ed2b34cbb03caef;p=mailer.git

diff --git a/inc/config-global.php b/inc/config-global.php
index f3a26f6121..1b40b2c937 100644
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -14,11 +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, 2010 by Mailer Developer Team                    *
+ * 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 *
@@ -46,22 +44,28 @@ if (!defined('__SECURITY')) {
  *      PLEASE DO NOT EDIT THE COMMENTS! install.php NEEDS THEM!        *
  ************************************************************************/
 
+// Proper function exists?
+if (function_exists('date_default_timezone_set')) {
+	// Set default timezone to Europe/Berlin (because I'm from Germany)
+	@date_default_timezone_set('Europe/Berlin');
+} // END - if
+
 // CFG: ERROR_REPORTING
 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') as $inc) {
-	include($PATH . 'inc/' . $inc . '-functions.php');
+foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'stats', 'http', 'xml', 'callback') 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']));
@@ -73,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');
@@ -86,10 +93,10 @@ setConfigEntry('AUTHOR' , 'Roland Häder');
 setConfigEntry('TITLE', 'Mailer Project');
 
 // CFG: COPY
-setConfigEntry('COPY', 'Copyright &copy; 2003 - 2009, by Roland H&auml;der,<br />2009, 2010 by Mailer Developer Team');
+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 (This setting is overwritten by ext-other; at least version 0.2.6)
 setConfigEntry('stats_enabled', 'N');
@@ -97,7 +104,17 @@ 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);
+
+// 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');
 
 // Init stats system