A lot fixes to templates and missing functions added, more rewrites

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 14ff7074fe7f46be755e3a2f3f76cdada506f75e..87395a3e08d5f7aaf6fe013c6b46acdbb1fb35f4 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -56,10 +56,10 @@ set_error_handler('__errorHandler');
 register_shutdown_function('__SHUTDOWN_HOOK');
 
 // Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (isInstalled())) {
        // No login entered and outside installation mode
        OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
-       if (isBooleanConstantAndTrue('mxchange_installed')) {
+       if (isInstalled()) {
                // You have changed my configuration file!
                mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
        } else {
@@ -85,8 +85,9 @@ $GLOBALS['header_sent'] = 0;
 initFatalMessages();
 
 // Check if this file is writeable or read-only and warn the user
-if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if ((!isInstalling()) && (isInstalled())) {
        // Check for write-permission for config.php and inc directory
+       if (empty($GLOBALS['module'])) $GLOBALS['module'] = REQUEST_GET('module');
        if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
 
        // CSS array
@@ -181,25 +182,16 @@ if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
                                        define('RAND_NUMBER', mt_rand(1000000, 9999999));
                                }
                        } else {
-                               // Add language system
-                               LOAD_INC_ONCE("inc/language.php");
-
                                // Wrong database?
-                               addFatalMessage(getMessage('WRONG_DB_SELECTED'));
+                               addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
                        }
                } else {
-                       // Add language system
-                       LOAD_INC_ONCE("inc/language.php");
-
                        // No link to database!
-                       addFatalMessage(getMessage('NO_DB_LINK'));
+                       addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
                }
        } else {
-               // Add language system
-               LOAD_INC_ONCE("inc/language.php");
-
                // Maybe you forgot to enter your MySQL data?
-               addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
+               addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
        }
 } else {
        ///////////////////////////////////////////////////
@@ -219,21 +211,24 @@ if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        } // END - if
 
        // Double-check installation mode
-       if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
+       if ((!isInstalled()) || (!isAdminRegistered())) {
                // Check for file permissions
                if (!IS_INC_WRITEABLE("config")) {
-                       addFatalMessage(getMessage('CONFIG_IS_WRITE_PROTECTED'));
+                       addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED'));
                } // END - if
                if (!IS_INC_WRITEABLE("dummy")) {
-                       addFatalMessage(getMessage('DUMMY_IS_WRITE_PROTECTED'));
+                       addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED'));
                } // END - if
                if (!IS_INC_WRITEABLE(".secret/dummy")) {
-                       addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
+                       addFatalMessage(__FILE__, __LINE__, getMessage('SECRET_IS_WRITE_PROTECTED'));
                } // END - if
        } // END - if
+
+       // Run the init filter chain
+       RUN_FILTER('init');
 }
 
-if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
+if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($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");