Several rewrites/renames, fixes for installation. Resolves #104

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 1d5496449d675664772c5a60a788aa48d3f17927..ee7ec8ebfd02599335e797ac30fe1244ecad912f 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -104,7 +104,7 @@ if ((!isInstalling()) && (isInstalled())) {
                                unset($MySQL);
 
                                // Load configuration stuff
-                               mergeConfig(LOAD_CONFIG());
+                               loadConfiguration();
 
                                // Load "databases" aka static arrays
                                LOAD_INC_ONCE("inc/databases.php");
@@ -135,7 +135,7 @@ if ((!isInstalling()) && (isInstalled())) {
                                }
 
                                // Run the init filter chain
-                               RUN_FILTER('init');
+                               runFilterChain('init');
 
                                // Set default 'what' value
                                //* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />");
@@ -158,8 +158,8 @@ if ((!isInstalling()) && (isInstalled())) {
 
                                // Load all active extension including language files when not upgrading.
                                // Check module for testing and count one click
-                               $dummy = CHECK_MODULE($GLOBALS['module']);
-                               if ($dummy == "done") COUNT_MODULE($GLOBALS['module']);
+                               $dummy = checkModulePermissions($GLOBALS['module']);
+                               if ($dummy == "done") countModuleHit($GLOBALS['module']);
                                unset($dummy);
 
                                // Shall we activate the exchange?
@@ -169,9 +169,9 @@ if ((!isInstalling()) && (isInstalled())) {
                                if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
                                        // Generate random number
                                        if (isset($GLOBALS['userid'])) {
-                                               define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
+                                               define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
                                        } else {
-                                               define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
+                                               define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), 0, ""));
                                        }
                                } else {
                                        // Generate weak (!!!) code
@@ -221,7 +221,7 @@ if ((!isInstalling()) && (isInstalled())) {
        } // END - if
 
        // Run the init filter chain
-       RUN_FILTER('init');
+       runFilterChain('init');
 }
 
 if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {