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 afe85d4ceccca7e52d1144b7c8263b610c129dbb..e34c4cfb9d33f5d6c2574199d5a3d3af6e115590 100644 (file)
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -10,14 +10,9 @@
  * -------------------------------------------------------------------- *
  * 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                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
  * it under the terms of the GNU General Public License as published by *
@@ -50,30 +45,39 @@ 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
-$PATH = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3));
+// 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','stats') as $inc) {
-       include($PATH . 'inc/' . $inc . '-functions.php');
+foreach (array('config', 'wrapper', 'template', 'module', 'inc', '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']));
+// 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();
 
+// Init HTTP handling
+initHttp();
+
+// CFG: FLOAT-MASK
+setConfigEntry('FLOAT_MASK', '%01.5f');
+
 // CFG: HOST-URL (without trailing '/' !)
 setConfigEntry('URL', $URL);
 
@@ -81,7 +85,7 @@ setConfigEntry('URL', $URL);
 setConfigEntry('DOMAIN', detectDomainName());
 
 // CFG: SERVER-PATH
-setConfigEntry('PATH', $PATH);
+setConfigEntry('PATH', $path);
 
 // CFG: VERSION
 setConfigEntry('VERSION', 'v0.2.1');
@@ -90,23 +94,33 @@ 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 &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: STATS-ENABLED (This setting is overwritten by ext-other; at least version 0.2.6)
-setConfigEntry('stats_enabled', 'N');
+// CFG: CACHE-EXTENSION
+setConfigEntry('CACHE_EXTENSION', '.cache.php');
 
-// GLOBAL: DEBUG-TEMPLATE-CACHE
-setConfigEntry('DEBUG_TEMPLATE_CACHE', 'N');
+// CFG: INTERNAL-STATS (This setting is overwritten by ext-other equal and prior version 0.2.7)
+setConfigEntry('internal_stats', 'N');
+
+// CFG: DEBUG-TEMPLATE-CACHE
+setConfigEntry('DEBUG_TEMPLATE_CACHE', 'Y');
 
 // 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');