X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-global.php;h=f43e484d1ea251f2b6b3f81d9707ea878fd8952a;hb=647822147615bad8572ad4282c9c3958fe983f5c;hp=de8dd4841dce5e5079d3be85ee894b17076872bb;hpb=8cef2a4631919672cbbfd484f6e198e1f21b087d;p=mailer.git

diff --git a/inc/config-global.php b/inc/config-global.php
index de8dd4841d..f43e484d1e 100644
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * 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 *
@@ -56,18 +56,18 @@ 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', 'referral') 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!)
+// Auto-detection of URL
 $URL = 'http://' . detectServerName() . str_replace("\\", '/', dirname($_SERVER['PHP_SELF']));
 while (substr($URL, -1, 1) == '/') { $URL = substr($URL, 0, -1); }
 
@@ -77,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');
@@ -87,20 +90,30 @@ setConfigEntry('VERSION', 'v0.2.1');
 setConfigEntry('AUTHOR' , 'Roland Häder');
 
 // CFG: TITLE
-setConfigEntry('TITLE', 'Mailer Project');
+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', 'inc/cache/');
 
-// CFG: STATS-ENABLED (This setting is overwritten by ext-other; at least version 0.2.6)
-setConfigEntry('stats_enabled', 'N');
+// CFG: INTERNAL-STATS (This setting is overwritten by ext-other equal and prior version 0.2.7)
+setConfigEntry('internal_stats', 'N');
 
 // GLOBAL: DEBUG-TEMPLATE-CACHE
 setConfigEntry('DEBUG_TEMPLATE_CACHE', 'N');
 
+// 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');