X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=326edc5cebe82223b7de24dd11af802d0b5a9d6c;hp=3ad0efec6165f539c9cd20419c79d397a43b54ae;hb=3af8b17c962e094e3eaffbd6d111290cdb286c92;hpb=452578b5bf17d14099ee44956deb4e4dc0832874

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 3ad0efec61..326edc5ceb 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Verbindet zu Ihrer Datenbank                     *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 require("inc/functions.php");
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
 	// Load special functions
 	LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
 } // END - foreach
@@ -60,12 +60,12 @@ if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('instal
 	OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
 	if (isInstalled()) {
 		// You have changed my configuration file!
-		mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
+		app_die(__FILE__, __LINE__, "{--DIE_CONFIG_CHANGED_YOU--}");
 	} else {
 		// Please run the installation script (maybe again)
-		mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
+		app_die(__FILE__, __LINE__, "{--DIE_RUN_INSTALL_MYSQL--}");
 	}
-} elseif ((!isInstalling()) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isInstalling()) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
 	// No database password entered!!!
 	OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
 }
@@ -105,11 +105,14 @@ if ((!isInstalling()) && (isInstalled())) {
 				// Load configuration stuff
 				loadConfiguration();
 
+				// Load "databases" aka static arrays
+				LOAD_INC_ONCE("inc/databases.php");
+
 				// Init session
 				LOAD_INC_ONCE("inc/session.php");
 
-				// Load "databases" aka static arrays
-				LOAD_INC_ONCE("inc/databases.php");
+				// Load versions
+				LOAD_INC_ONCE("inc/versions.php");
 
 				// Loading patching system is required here...
 				LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
@@ -160,9 +163,7 @@ if ((!isInstalling()) && (isInstalled())) {
 
 				// Load all active extension including language files when not upgrading.
 				// Check module for testing and count one click
-				$dummy = checkModulePermissions($GLOBALS['module']);
-				if ($dummy == "done") countModuleHit($GLOBALS['module']);
-				unset($dummy);
+				if (checkModulePermissions($GLOBALS['module']) == "done") countModuleHit($GLOBALS['module']);
 
 				// Shall we activate the exchange?
 				if (getConfig('activate_xchange') > 0) activateExchange();
@@ -170,11 +171,7 @@ if ((!isInstalling()) && (isInstalled())) {
 				// Is the extension sql_patches installed and at least 0.3.6?
 				if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
 					// Generate random number
-					if (isset(getUserId())) {
-						define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ""));
-					} else {
-						define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), 0, ""));
-					}
+					define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ""));
 				} else {
 					// Generate weak (!!!) code
 					define('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -199,14 +196,17 @@ if ((!isInstalling()) && (isInstalled())) {
 	// Set other missing variables
 	if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
 
+	// Include databases.php
+	LOAD_INC_ONCE("inc/databases.php");
+
 	// Init session
 	LOAD_INC_ONCE("inc/session.php");
 
-	// Include databases.php
-	LOAD_INC_ONCE("inc/databases.php");
+	// Load versions
+	LOAD_INC_ONCE("inc/versions.php");
 
 	// Check if we are in installation routine
-	if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
+	if ((!isInstalling()) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
 		// Redirect to the installation system
 		LOAD_URL("install.php");
 	} // END - if