X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fconfig-global.php;h=94cb2c867a5a7c03fdab3fccac7f6917d41539f0;hp=a493b1a926267bf599fbb08da1bdce2570856fb0;hb=cb11b0028323b24de48bfbab2ed576455e0d9465;hpb=ef93474b89c9e51dd97f4eb79b260630f05216f2

diff --git a/inc/config-global.php b/inc/config-global.php
index a493b1a926..94cb2c867a 100644
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Globale Konfiguration                            *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * 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 *
@@ -40,58 +35,23 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
-/************************************************************************
- *      PLEASE DO NOT EDIT THE COMMENTS! install.php NEEDS THEM!        *
- ************************************************************************/
-
-// Proper function exists?
-if (function_exists('date_default_timezone_set')) {
-	// Set default timezone to Europe/Berlin (because I'm from Germany)
-	@date_default_timezone_set('Europe/Berlin');
-} // END - if
-
-// CFG: ERROR-REPORTING
-error_reporting(E_ALL | E_DEPRECATED | E_STRICT);
-
-// Is the function there? (removed in PHP 5.4.0)
-if (function_exists('import_request_variables')) {
-	// CFG: REGISTER-GLOBALS
-	@import_request_variables('');
-} // END - if
-
-// Detect path (without 'inc') and fix windozer paths
-$path = str_replace(chr(92), '/', substr(dirname(__FILE__), 0, -3));
-
-// Some very important function includes
-foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'http') as $inc) {
-	include($path . 'inc/' . $inc . '-functions.php');
-} // END - foreach
-
-// General functions
-include($path . 'inc/functions.php');
+/********************************************************************************
+ * Please don't touch anything here. Instead set them again in config-local.php *
+ ********************************************************************************/
 
 // Auto-detection of URL
-$URL = 'http://' . detectServerName() . str_replace(chr(92), '/', dirname($_SERVER['PHP_SELF']));
+$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();
-
-// Init HTTP handling
-initHttp();
+// CFG: HOST-URL (without trailing '/' !)
+setConfigEntry('URL', $URL);
 
 // CFG: FLOAT-MASK
 setConfigEntry('FLOAT_MASK', '%01.5f');
 
-// CFG: HOST-URL (without trailing '/' !)
-setConfigEntry('URL', $URL);
-
 // CFG: DOMAIN-NAME (without trailing '/' !)
 setConfigEntry('DOMAIN', detectDomainName());
 
-// CFG: SERVER-PATH
-setConfigEntry('PATH', $path);
-
 // CFG: VERSION
 setConfigEntry('VERSION', 'v0.2.1');
 
@@ -102,7 +62,7 @@ setConfigEntry('AUTHOR' , 'Roland Häder');
 setConfigEntry('TITLE', 'Mailer-Project');
 
 // CFG: COPY
-setConfigEntry('COPY', 'Copyright &copy; 2003 - 2009, by Roland H&auml;der,<br />2009 - 2014 by Mailer Developer Team');
+setConfigEntry('COPY', 'Copyright &copy; 2003 - 2009, by Roland H&auml;der,<br />2009 - 2016 by Mailer Developer Team');
 
 // CFG: CACHE-PATH
 setConfigEntry('CACHE_PATH', 'inc/cache/');
@@ -123,14 +83,7 @@ setConfigEntry('salt_length', 10);
 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
-initStatsSystem();
+unset($URL);
 
 // [EOF]
 ?>