Installation rewritten to use more EL code

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

diff --git a/inc/config-global.php b/inc/config-global.php
index 8a2f4b38f06c6a7b3933827e7be365e42e2447d9..a2becbbc33a5cec7ff2c5c5fd53ada6df3739f0d 100644 (file)
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -56,16 +56,16 @@ 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') 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']));
@@ -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');
@@ -90,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');
@@ -101,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