X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-manager.php;h=e1be2665f0ea0af7cfed4d3854b5849e6d24f7ae;hb=ee3e99bb6cc6ae2b14d12436f2bb0a23ab698ceb;hp=749a368f42e504db7d443c74214e19c48a530eb2;hpb=1e38f6d41e6eac45cc8c80da7ace0d82b25259a3;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 749a368f42..e1be2665f0 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -368,58 +368,53 @@ function isMember () {
 	// @TODO Try to rewrite this to one or more functions
 	if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array();
 
-	// is the cache entry there?
+	// Is the cache entry there?
 	if (isset($GLOBALS[__FUNCTION__])) {
 		// Then return it
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS[__FUNCTION__]) . ')');
 		return $GLOBALS[__FUNCTION__];
 	} elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
-		// No member
+		// Destroy any existing user session data
+		destroyMemberSession();
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
+
+		// Abort further processing
 		return false;
-	} else {
-		// Get it secured from session
-		setMemberId(getSession('userid'));
-		setCurrentUserId(getMemberId());
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getSession('userid') . ' used from cookie/session.');
 	}
 
+	// Get userid secured from session
+	setMemberId(getSession('userid'));
+
+	// ... and set it as currently handled user id
+	setCurrentUserId(getMemberId());
+
 	// Init user data array
 	initUserData();
 
 	// Fix "deleted" cookies first
 	fixDeletedCookies(array('userid', 'u_hash'));
 
-	// Are cookies set?
-	if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
-		// Cookies are set with values, but are they valid?
-		if (fetchUserData(getMemberId()) === true) {
-			// Validate password by created the difference of it and the secret key
-			$valPass = encodeHashForCookie(getUserData('password'));
+	// Are cookies set and can the member data be loaded?
+	if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === true)) {
+		// Validate password by created the difference of it and the secret key
+		$valPass = encodeHashForCookie(getUserData('password'));
 
+		// So did we now have valid data and an unlocked user?
+		if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
 			// Transfer last module and online time
 			$GLOBALS['last_online']['module'] = getUserData('last_module');
 			$GLOBALS['last_online']['online'] = getUserData('last_online');
 
-			// So did we now have valid data and an unlocked user?
-			if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
-				// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
-				$ret = true;
-			} else {
-				// Maybe got locked etc.
-				//* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status') . ',' . $valPass . '(' . strlen($valPass) . ')/' . getSession('u_hash') . '(' . strlen(getSession('u_hash')) . ')/' . getUserData('password') . '(' . strlen(getUserData('password')) . ')');
-				destroyMemberSession();
-			}
-		} else {
-			// Cookie data is invalid!
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data invalid or user not found.');
-			destroyMemberSession();
-		}
-	} else {
-		// Cookie data is invalid!
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data not complete.');
+			// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
+			$ret = true;
+		} // END - if
+	} // END - if
+
+	// Is $ret still false?
+	if ($ret === false) {
+		// Yes, so destroy the session
 		destroyMemberSession();
-	}
+	} // END - if
 
 	// Cache status
 	$GLOBALS[__FUNCTION__] = $ret;
@@ -1479,18 +1474,16 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
 // Activate exchange
 function FILTER_ACTIVATE_EXCHANGE () {
 	// Is the extension 'user' there?
-	if ((!isExtensionActive('user')) || (getConfig('activate_xchange') == '0')) {
+	if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) {
 		// Silently abort here
 		return false;
 	} // END - if
 
 	// Check total amount of users
-	if (getTotalConfirmedUser() >= getConfig('activate_xchange')) {
+	if (getTotalConfirmedUser() >= getActivateXchange()) {
 		// Activate System
-		setSqlsArray(array(
-			"UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1",
-			"UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2",
-		));
+		addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1");
+		addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2");
 
 		// Run SQLs
 		runFilterChain('run_sqls');