X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-global.php;h=a2becbbc33a5cec7ff2c5c5fd53ada6df3739f0d;hb=9f30db83eedcaf1d265d973e4bffcd3fa7df9bde;hp=fc4c6e65f9df48a0d7d3bfe7ce30d2e229cb434d;hpb=b020dc84361bb6a605050d04e1ea311414b9bcfe;p=mailer.git

diff --git a/inc/config-global.php b/inc/config-global.php
index fc4c6e65f9..a2becbbc33 100644
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -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']));
@@ -81,7 +81,7 @@ setConfigEntry('URL', $URL);
 setConfigEntry('DOMAIN', detectDomainName());
 
 // CFG: SERVER-PATH
-setConfigEntry('PATH', $PATH);
+setConfigEntry('PATH', $path);
 
 // CFG: VERSION
 setConfigEntry('VERSION', 'v0.2.1');
@@ -104,6 +104,16 @@ setConfigEntry('stats_enabled', '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');