All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index c9e95630ec82e0f7b68ea34c882fa7fcae3862de..697481ec2e48674f0d6af19a757eb61591047296 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -41,19 +41,19 @@ if (!defined('__SECURITY')) {
 define('DEBUG_SQL', false);
 
 // Non-database functions
-require_once(PATH."inc/functions.php");
+LOAD_INC_ONCE("inc/functions.php");
 
 // Filter functions
-require_once(PATH."inc/filters.php");  
+LOAD_INC_ONCE("inc/filters.php");  
 
 // Functions which interact with the database
-require_once(PATH."inc/mysql-manager.php");
+LOAD_INC_ONCE("inc/mysql-manager.php");
 
 // Load extensions and language
-require_once(PATH."inc/extensions.php");
+LOAD_INC_ONCE("inc/extensions.php");
 
 // Load database library
-require_once(PATH."inc/db/lib.php");
+LOAD_INC_ONCE("inc/db/lib.php");
 
 // Error handler function
 function __errorHandler ($errno, $errstr, $errfile, $errline) {
@@ -166,21 +166,21 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
 
                                // Load "databases" aka static arrays
-                               require_once(PATH."inc/databases.php");
+                               LOAD_INC_ONCE("inc/databases.php");
 
                                // Loading patching system is required here...
-                               require_once(PATH."inc/patch-system.php"); // Initialize patch system
+                               LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
 
                                // Session management
-                               require_once(PATH."inc/session.php");
+                               LOAD_INC_ONCE("inc/session.php");
 
                                // Run daily reset
-                               require_once(PATH."inc/check-reset.php");
+                               LOAD_INC_ONCE("inc/check-reset.php");
 
                                // Load admin include file if he is admin
                                if (IS_ADMIN()) {
                                        // Administrative functions
-                                       require_once(PATH."inc/modules/admin/admin-inc.php");
+                                       LOAD_INC_ONCE("inc/modules/admin/admin-inc.php");
                                } // END - if
                                //* DEBUG: */ ADD_POINTS_REFSYSTEM("test", 36, 1000);
                                //* DEBUG: */ die();
@@ -216,7 +216,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                } // END - if
 
                                // Update sending pool
-                               if (($CSS != "1") && ($CSS != "-1")) require_once(PATH."inc/pool-update.php"); // Sends out mails in configureable steps
+                               if (($CSS != "1") && ($CSS != "-1")) LOAD_INC_ONCE("inc/pool-update.php"); // Sends out mails in configureable steps
 
                                // Load all active extension including language files when not upgrading.
                                // Check module for testing and count one click
@@ -241,14 +241,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                }
                        } else {
                                // Add language system
-                               require_once(PATH."inc/language.php");
+                               LOAD_INC_ONCE("inc/language.php");
 
                                // Wrong database?
                                addFatalMessage(getMessage('WRONG_DB_SELECTED'));
                        }
                } else {
                        // Add language system
-                       require_once(PATH."inc/language.php");
+                       LOAD_INC_ONCE("inc/language.php");
 
                        // No link to database!
                        addFatalMessage(getMessage('NO_DB_LINK'));
@@ -256,7 +256,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                }
        } else {
                // Add language system
-               require_once(PATH."inc/language.php");
+               LOAD_INC_ONCE("inc/language.php");
 
                // Maybe you forgot to enter your MySQL data?
                addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
@@ -271,8 +271,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        $link = false; // No database link by default
 
        // Include required files
-       require_once(PATH."inc/databases.php");
-       require_once(PATH."inc/session.php");
+       LOAD_INC_ONCE("inc/databases.php");
+       LOAD_INC_ONCE("inc/session.php");
 
        // Check if we are in installation routine
        if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) {
@@ -297,9 +297,9 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 
 if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
        // One or more fatal error(s) occur during connect...
-       require_once(PATH."inc/header.php");
-       require_once(PATH."inc/fatal_errors.php");
-       require_once(PATH."inc/footer.php");
+       LOAD_INC_ONCE("inc/header.php");
+       LOAD_INC_ONCE("inc/fatal_errors.php");
+       LOAD_INC_ONCE("inc/footer.php");
 } // END - if
 
 //