X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-global.php;h=60e9a8b5cc9f00670887e1f837472896361901d8;hb=d51d90ea79446c288184b023a7d1d3adabe739c3;hp=d67040bd1e86165a92e9a8d00b8bd1209cf0376f;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git
diff --git a/inc/config-global.php b/inc/config-global.php
index d67040bd1e..60e9a8b5cc 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', 'xml', 'callback', 'referal') 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');
@@ -87,10 +90,10 @@ 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 © 2003 - 2009, by Roland Häder,
2009, 2011 by Mailer Developer Team');
+setConfigEntry('COPY', 'Copyright © 2003 - 2009, by Roland Häder,
2009 - 2011 by Mailer Developer Team');
// CFG: CACHE_PATH
setConfigEntry('CACHE_PATH', 'inc/cache/');
@@ -101,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');