Some unneccessary parts removed because we have isInstalling() now

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index c932435b45991ba329f72494c5c7c20fef0479c7..84b149ef3ee036302ffd7b8c9790042ca90a3d44 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -11,9 +11,9 @@
  * Kurzbeschreibung  : Verbindet zu Ihrer Datenbank                     *
  * -------------------------------------------------------------------- *
  * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -42,14 +42,11 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
-// CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
-define('DEBUG_SQL', false);
-
 // Non-database functions
 require("inc/functions.php");
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
        // Load special functions
        LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
 } // END - foreach
@@ -57,11 +54,8 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'fi
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Register shutdown hook
-register_shutdown_function('__SHUTDOWN_HOOK');
-
 // Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (isInstalled())) {
+if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
        // No login entered and outside installation mode
        OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
        if (isInstalled()) {
@@ -71,7 +65,7 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_I
                // Please run the installation script (maybe again)
                mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
        }
-} elseif ((!isInstalling()) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isInstalling()) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
        // No database password entered!!!
        OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
 }
@@ -166,9 +160,7 @@ if ((!isInstalling()) && (isInstalled())) {
 
                                // Load all active extension including language files when not upgrading.
                                // Check module for testing and count one click
-                               $dummy = checkModulePermissions($GLOBALS['module']);
-                               if ($dummy == "done") countModuleHit($GLOBALS['module']);
-                               unset($dummy);
+                               if (checkModulePermissions($GLOBALS['module']) == "done") countModuleHit($GLOBALS['module']);
 
                                // Shall we activate the exchange?
                                if (getConfig('activate_xchange') > 0) activateExchange();
@@ -176,11 +168,7 @@ if ((!isInstalling()) && (isInstalled())) {
                                // Is the extension sql_patches installed and at least 0.3.6?
                                if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
                                        // Generate random number
-                                       if (isset($GLOBALS['userid'])) {
-                                               define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
-                                       } else {
-                                               define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), 0, ""));
-                                       }
+                                       define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ""));
                                } else {
                                        // Generate weak (!!!) code
                                        define('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -212,7 +200,7 @@ if ((!isInstalling()) && (isInstalled())) {
        LOAD_INC_ONCE("inc/databases.php");
 
        // Check if we are in installation routine
-       if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
+       if ((!isInstalling()) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
                // Redirect to the installation system
                LOAD_URL("install.php");
        } // END - if
@@ -238,7 +226,7 @@ if ((!isInstalling()) && (isInstalled())) {
        LOAD_EXTENSION("sql_patches");
 }
 
-if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
+if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != "1")) {
        // One or more fatal error(s) occur during connect...
        LOAD_INC_ONCE("inc/header.php");
        LOAD_INC_ONCE("inc/fatal_errors.php");