* Dummy extension "yoomedia" added for Yoo! Media's API (Interface 2.0 supported)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 813bcb6762ee73837ba309bf162b1a78d7ce19eb..49b40d35824e07f7bd2e82a3526a1c4b43820c56 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -64,11 +64,6 @@ if ((empty($MySQL['login'])) && (!isBooleanConstantAndTrue('mxchange_installing'
        echo "<STRONG>".LANG_WARNING.":</STRONG> ".WARN_NULL_PASSWORD;
 }
 
-// Init configuration arrays
-$_CONFIG = array(
-       'code_length' => 0
-);
-
 // 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
@@ -79,9 +74,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        }
        $EXT_CSS_FILES = array();
 
-       // Load "databases" aka static arrays
-       require_once(PATH."inc/databases.php");     // Several hard-coded databases (arrays, constants)
-
        if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
                // Connect to DB
                global $link;
@@ -130,15 +122,15 @@ LIMIT 1", __FILE__, __LINE__);
                                        // Load all extensions
                                        require_once(PATH."inc/load_extensions.php");
 
+                                       // Load "databases" aka static arrays
+                                       require_once(PATH."inc/databases.php");
+
                                        // Loading patching system is required here...
                                        require_once(PATH."inc/patch-system.php"); // Initialize patch system
 
                                        // Functions which are related to themes
                                        require_once(PATH."inc/theme-manager.php");
 
-                                       // Initialize session management
-                                       require_once(PATH."inc/session.php");
-
                                        // Load admin include file if he is admin
                                        if (IS_ADMIN()) {
                                                // Administrative functions
@@ -205,6 +197,13 @@ LIMIT 1", __FILE__, __LINE__);
 
                                // Free memory
                                SQL_FREERESULT($result);
+
+                               // Generate random number
+                               if (isset($GLOBALS['userid'])) {
+                                       define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
+                               } else {
+                                       define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
+                               }
                        } else {
                                // Wrong database?
                                ADD_FATAL(WRONG_DB_SELECTED);
@@ -235,7 +234,6 @@ LIMIT 1", __FILE__, __LINE__);
        require_once(PATH."inc/databases.php");
        require_once(PATH."inc/theme-manager.php");
        require_once(PATH."inc/load_extensions.php");
-       require_once(PATH."inc/session.php");
 
        // Check if we are in installation routine
        $installPhp = basename($_SERVER['PHP_SELF']);