Several rewrites/fixes which I have done yesterday but not commited, mxchange_die...

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index f1b627cf2bc52d963692661be0eadc9ce4c717ee..326edc5cebe82223b7de24dd11af802d0b5a9d6c 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Verbindet zu Ihrer Datenbank                     *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Revision::                                                        $ *
+ * $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!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 require("inc/functions.php");
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
        // Load special functions
        LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
 } // END - foreach
@@ -60,12 +60,12 @@ if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('instal
        OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
        if (isInstalled()) {
                // You have changed my configuration file!
-               mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
+               app_die(__FILE__, __LINE__, "{--DIE_CONFIG_CHANGED_YOU--}");
        } else {
                // Please run the installation script (maybe again)
-               mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
+               app_die(__FILE__, __LINE__, "{--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--}");
 }
@@ -105,11 +105,14 @@ if ((!isInstalling()) && (isInstalled())) {
                                // Load configuration stuff
                                loadConfiguration();
 
+                               // Load "databases" aka static arrays
+                               LOAD_INC_ONCE("inc/databases.php");
+
                                // Init session
                                LOAD_INC_ONCE("inc/session.php");
 
-                               // Load "databases" aka static arrays
-                               LOAD_INC_ONCE("inc/databases.php");
+                               // Load versions
+                               LOAD_INC_ONCE("inc/versions.php");
 
                                // Loading patching system is required here...
                                LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
@@ -193,14 +196,17 @@ if ((!isInstalling()) && (isInstalled())) {
        // Set other missing variables
        if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
 
+       // Include databases.php
+       LOAD_INC_ONCE("inc/databases.php");
+
        // Init session
        LOAD_INC_ONCE("inc/session.php");
 
-       // Include databases.php
-       LOAD_INC_ONCE("inc/databases.php");
+       // Load versions
+       LOAD_INC_ONCE("inc/versions.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