Rewrites for installation of sql_patches

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index f52848abc04bb0db01758ac92c0ba85d5d5511af..fe540b053b3cbbc1cd35d46c18e694587f13bbcb 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -84,13 +84,13 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
 set_error_handler('__errorHandler');
 
 // Call-back function for running shutdown functions
-function __run_shutdown_filter () {
+function __RUN_SHUTDOWN_FILTER () {
        // Call the filter chain 'shutdown'
        RUN_FILTER('shutdown', null, false);
 }
 
 // Register shutdown hook
-register_shutdown_function('__run_shutdown_filter');
+register_shutdown_function('__RUN_SHUTDOWN_FILTER');
 
 // Check if the user setups his MySQL stuff...
 if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
@@ -103,11 +103,18 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
                // Please run the installation script (maybe again)
                die(DIE_RUN_INSTALL_MYSQL);
        }
-} elseif ((!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
        // No database password entered!!!
        echo "<STRONG>".LANG_WARNING.":</STRONG> ".WARN_NULL_PASSWORD;
 }
 
+// Set dummy $_CONFIG array
+$_CONFIG = array(
+       'code_length' => 0,
+       'patch_level' => 0,
+       'last_update' => time()
+);
+
 // Check if this file is writeable or read-only and warn the user
 if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // Check for write-permission for config.php and inc directory
@@ -129,12 +136,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 
                        // Is it a valid resource?
                        if ($db === true) {
-                               // Remove MySQL array from namespace
+                               // This is required for extension 'optimize' to work
                                define('__DB_NAME', $MySQL['dbase']);
+
+                               // Remove MySQL array from namespace
                                unset($MySQL);
 
                                // Load configuration stuff
-                               $_CONFIG = LOAD_CONFIG();
+                               $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
 
                                // Initialize include-file-pool
                                $INC_POOL = array();
@@ -151,6 +160,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                // Run daily reset
                                require_once(PATH."inc/check-reset.php");
 
+                               // Create missing configuration file
+                               if (!function_exists('GET_CURR_THEME')) {
+                                       // Load dummy theme functions
+                                       require_once(PATH."inc/theme-dummy.php");
+                               } // END - if
+
                                // Load admin include file if he is admin
                                if (IS_ADMIN()) {
                                        // Administrative functions
@@ -185,7 +200,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                        } elseif (($GLOBALS['module'] == "index") || ($GLOBALS['module'] == "login")) {
                                                // Set 'what' value to 'welcome' in guest and member menu
                                                $GLOBALS['what'] = "welcome";
-                                               if (!empty($_CONFIG['index_home'])) $GLOBALS['what'] = $_CONFIG['index_home'];
+                                               if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
                                        } else {
                                                // Anything else like begging link
                                                $GLOBALS['what'] = "";
@@ -202,7 +217,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                unset($dummy);
 
                                // Shall we activate the exchange?
-                               if ($_CONFIG['activate_xchange'] > 0) activateExchange();
+                               if (getConfig('activate_xchange') > 0) activateExchange();
 
                                // Is the extension sql_patches installed and at least 0.3.6?
                                if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
@@ -243,11 +258,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        // Include neccessary functions for installation //
        ///////////////////////////////////////////////////
 
-       // Set CONFIG array
-       $_CONFIG = array(
-               'code_length' => 0
-       );
-
        // Set other missing variables
        $link = false; // No database link by default
 
@@ -255,6 +265,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        require_once(PATH."inc/databases.php");
        require_once(PATH."inc/session.php");
 
+       // Create missing configuration file
+       if (!function_exists('GET_CURR_THEME')) {
+               // Load dummy theme functions
+               require_once(PATH."inc/theme-dummy.php");
+       } // END - if
+
        // Check if we are in installation routine
        $installPhp = basename($_SERVER['PHP_SELF']);
        if (($installPhp != "install.php") && ($CSS != "1") && ($CSS != -1)) {