X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=9cd96c8fa492f27b5bdde675b4488abe42986120;hb=b17c72e5a671033c7079e43f28a43537e9f16ccf;hp=813bcb6762ee73837ba309bf162b1a78d7ce19eb;hpb=dbef43c3a859518367f9ee0dde8e895ec677af23;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 813bcb6762..9cd96c8fa4 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -40,6 +40,10 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
 define('DEBUG_SQL', false);
 
+// Default is not a frameset
+global $isFrameset;
+$isFrameset = false;
+
 // Load library
 require_once(PATH."inc/db/lib.php");
 
@@ -64,11 +68,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 +78,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;
@@ -121,14 +117,14 @@ LIMIT 1", __FILE__, __LINE__);
 					// Run daily reset
 					if ((date("d", $_CONFIG['last_update']) != date("d", time()) || ((isBooleanConstantAndTrue('DEBUG_MODE')))) && (!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_GET['register'])) && ($CSS != 1)) {
 						// Do daily things in external PHP file but only when script is completely setup
-						$INC_POOL[] = PATH."inc/reset/reset_daily.php";
+						$INC_POOL[] = sprintf("%sinc/reset/reset_daily.php", PATH);
 
 						// Daily reset was run!
 						define('__DAILY_RESET', "1");
 					}
 
-					// 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
@@ -136,9 +132,6 @@ LIMIT 1", __FILE__, __LINE__);
 					// 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
@@ -163,7 +156,7 @@ LIMIT 1", __FILE__, __LINE__);
 					UPDATE_ONLINE_LIST(get_session('PHPSESSID'), $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']);
 
 					// Load theme name
-					$CurrTheme = GET_CURR_THEME();
+					$currTheme = GET_CURR_THEME();
 
 					// Set default 'what' value
 					//* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
@@ -205,6 +198,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);
@@ -234,8 +234,6 @@ LIMIT 1", __FILE__, __LINE__);
 	// Include required files
 	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']);