Some functions rewritten to hungarian notation, handling of array rewritten

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index a8d95cf98fd0b49b5a2ed8300c5d47f91f9a1eae..5d0c6c8a489fb7b2b5b1e21b2cd2e9848ca37d81 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -95,7 +95,7 @@ function __SHUTDOWN_HOOK () {
                SQL_CLOSE($link, __FILE__, __LINE__);
        } else {
                // No database link
-               ADD_FATAL(NO_DB_LINK);
+               addFatalMessage(NO_DB_LINK);
        }
 }
 
@@ -125,6 +125,10 @@ $_CONFIG = array(
        'last_update' => time()
 );
 
+// Init fatal messages
+global $FATAL;
+$FATAL = array();
+
 // 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
@@ -234,14 +238,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                include (PATH."inc/language.php");
 
                                // Wrong database?
-                               ADD_FATAL(WRONG_DB_SELECTED);
+                               addFatalMessage(WRONG_DB_SELECTED);
                        }
                } else {
                        // Add language system
                        include (PATH."inc/language.php");
 
                        // No link to database!
-                       ADD_FATAL(NO_DB_LINK);
+                       addFatalMessage(NO_DB_LINK);
                        $db = false;
                }
        } else {
@@ -249,7 +253,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                include (PATH."inc/language.php");
 
                // Maybe you forgot to enter your MySQL data?
-               ADD_FATAL(MYSQL_DATA_MISSING);
+               addFatalMessage(MYSQL_DATA_MISSING);
        }
 } else {
        ///////////////////////////////////////////////////
@@ -274,26 +278,22 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                // Check for file permissions
                if (!IS_INC_WRITEABLE("config")) {
-                       ADD_FATAL(CONFIG_IS_WRITE_PROTECTED);
+                       addFatalMessage(CONFIG_IS_WRITE_PROTECTED);
                } // END - if
                if (!IS_INC_WRITEABLE("dummy")) {
-                       ADD_FATAL(DUMMY_IS_WRITE_PROTECTED);
+                       addFatalMessage(DUMMY_IS_WRITE_PROTECTED);
                } // END - if
                if (!IS_INC_WRITEABLE(".secret/dummy")) {
-                       ADD_FATAL(SECRET_IS_WRITE_PROTECTED);
+                       addFatalMessage(SECRET_IS_WRITE_PROTECTED);
                } // END - if
        } // END - if
 }
 
-// Any fatal messages?
-if (!is_array($FATAL)) $FATAL = array();
-if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
+if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
        // One or more fatal error(s) occur during connect...
        include (PATH."inc/header.php");
        include (PATH."inc/fatal_errors.php");
-       unset($FATAL);
        include (PATH."inc/footer.php");
-       exit;
 } // END - if
 
 //