Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

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

diff --git a/inc/config-global.php b/inc/config-global.php
index 038d1dec8b60a7349dd748f448cee60f4749fd88..e34c4cfb9d33f5d6c2574199d5a3d3af6e115590 100644 (file)
--- 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 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,17 +45,20 @@ if (function_exists('date_default_timezone_set')) {
        @date_default_timezone_set('Europe/Berlin');
 } // END - if
 
-// CFG: ERROR_REPORTING
-error_reporting(E_ALL | E_STRICT);
+// CFG: ERROR-REPORTING
+error_reporting(E_ALL | E_DEPRECATED | E_STRICT);
 
-// CFG: REGISTER-GLOBALS
-@import_request_variables('');
+// 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("\\", '/', substr(dirname(__FILE__), 0, -3));
+$path = str_replace(chr(92), '/', substr(dirname(__FILE__), 0, -3));
 
 // Some very important function includes
-foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'stats', 'http', 'xml', 'callback', 'referral') as $inc) {
+foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'http') as $inc) {
        include($path . 'inc/' . $inc . '-functions.php');
 } // END - foreach
 
@@ -68,12 +66,18 @@ foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'stats', 'http'
 include($path . 'inc/functions.php');
 
 // Auto-detection of URL
-$URL = 'http://' . detectServerName() . str_replace("\\", '/', 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: FLOAT-MASK
+setConfigEntry('FLOAT_MASK', '%01.5f');
+
 // CFG: HOST-URL (without trailing '/' !)
 setConfigEntry('URL', $URL);
 
@@ -93,11 +97,14 @@ setConfigEntry('AUTHOR' , 'Roland Häder');
 setConfigEntry('TITLE', 'Mailer-Project');
 
 // CFG: COPY
-setConfigEntry('COPY', 'Copyright &copy; 2003 - 2009, by Roland H&auml;der,<br />2009 - 2011 by Mailer Developer Team');
+setConfigEntry('COPY', 'Copyright &copy; 2003 - 2009, by Roland H&auml;der,<br />2009 - 2015 by Mailer Developer Team');
 
-// CFG: CACHE_PATH
+// CFG: CACHE-PATH
 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');