X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-global.php;h=94cb2c867a5a7c03fdab3fccac7f6917d41539f0;hb=refs%2Fheads%2Fserver-0.2.1-FINAL%2Fshipsimu-org;hp=b7e81697432905203c2f5f9b6fd28e095bbc29db;hpb=b8a6f8012aa3509d8e0f8fd078e044f20e80707a;p=mailer.git

diff --git a/inc/config-global.php b/inc/config-global.php
index b7e8169743..94cb2c867a 100644
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -10,15 +10,9 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Globale Konfiguration                            *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2016 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 *
@@ -41,41 +35,22 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
-/************************************************************************
- *      PLEASE DO NOT EDIT THE COMMENTS! install.php NEEDS THEM!        *
- ************************************************************************/
-
-if (function_exists('date_default_timezone_set')) {
-	// CFG: TIME-ZONE
-	@date_default_timezone_set('Europe/Berlin');
-} // END - if
-
-// CFG: ERROR_REPORTING
-error_reporting(E_ALL | E_STRICT);
-
-// CFG: REGISTER-GLOBALS
-@import_request_variables('');
+/********************************************************************************
+ * Please don't touch anything here. Instead set them again in config-local.php *
+ ********************************************************************************/
 
-// Detect path
-$PATH = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3));
-
-// Some very important function includes
-foreach (array('config','wrapper','inc','stats') as $inc) {
-	require($PATH . 'inc/' . $inc . '-functions.php');
-} // END - foreach
-
-// Auto-detection... (patched by "Stelzi" aka. profi-concept, thanks again!)
-$URL = 'http://' . getenv('SERVER_NAME') . str_replace("\\", '/', dirname($_SERVER['PHP_SELF']));
+// Auto-detection of URL
+$URL = detectServerProtocol() . '://' . detectServerName() . str_replace(chr(92), '/', dirname($_SERVER['PHP_SELF']));
 while (substr($URL, -1, 1) == '/') { $URL = substr($URL, 0, -1); }
 
-// Initialize the configuration
-initConfig();
-
 // CFG: HOST-URL (without trailing '/' !)
 setConfigEntry('URL', $URL);
 
-// CFG: SERVER-PATH
-setConfigEntry('PATH', $PATH);
+// CFG: FLOAT-MASK
+setConfigEntry('FLOAT_MASK', '%01.5f');
+
+// CFG: DOMAIN-NAME (without trailing '/' !)
+setConfigEntry('DOMAIN', detectDomainName());
 
 // CFG: VERSION
 setConfigEntry('VERSION', 'v0.2.1');
@@ -84,25 +59,31 @@ 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');
+setConfigEntry('COPY', 'Copyright &copy; 2003 - 2009, by Roland H&auml;der,<br />2009 - 2016 by Mailer Developer Team');
 
 // CFG: CACHE-PATH
-setConfigEntry('CACHE_PATH', getConfig('PATH') . 'inc/cache/');
+setConfigEntry('CACHE_PATH', 'inc/cache/');
+
+// CFG: CACHE-EXTENSION
+setConfigEntry('CACHE_EXTENSION', '.cache.php');
+
+// CFG: INTERNAL-STATS (This setting is overwritten by ext-other equal and prior version 0.2.7)
+setConfigEntry('internal_stats', 'N');
 
-// CFG: STATS-ENABLED (temporary tables, if your database crashs all is gone)
-setConfigEntry('STATS_ENABLED', 'Y');
+// CFG: DEBUG-TEMPLATE-CACHE
+setConfigEntry('DEBUG_TEMPLATE_CACHE', 'Y');
 
-// GLOBAL: DEBUG-TEMPLATE-CACHE
-setConfigEntry('DEBUG_TEMPLATE_CACHE', 'N');
+// CFG: SALT-LENGTH
+setConfigEntry('salt_length', 10);
 
-// Connect to the MySQL database...
-loadIncludeOnce('inc/mysql-connect.php');
+// CFG: MINIMUM-ADMIN-PASS-LENGTH
+setConfigEntry('minium_admin_pass_length', 4);
 
-// Init stats system
-initStatsSystem();
+// Remove maybe conflicting variables
+unset($URL);
 
 // [EOF]
 ?>