X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=9033db1373b0ca4845d2d5e6bae392156d68022f;hp=d56ddf7cd7d4dab2c0ca44b795f2cf40b43b2d11;hb=30f1d46dca2b026b23c8cefb7e6e4bdc98fee337;hpb=c3f2beb3f1d47c9593d262d7f5dac47640b4aa52

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index d56ddf7cd7..9033db1373 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -261,7 +261,7 @@ function checkModulePermissions ($module = '') {
 
 			// Destroy cache here
 			// @TODO Rewrite this to a filter
-			if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCacheFile('modules', 'modules');
+			if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCache('modules', 'modules');
 
 			// And reload data
 			unset($GLOBALS['module_status'][$module]);
@@ -272,7 +272,7 @@ function checkModulePermissions ($module = '') {
 		}
 	} elseif (($ret == 'cache_miss') && (getOutputMode() == '0')) {
 		// Rebuild the cache files
-		rebuildCacheFile('modules', 'modules');
+		rebuildCache('modules', 'modules');
 	} elseif ($found === false) {
 		// Problem with module detected
 		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s, locked=%s, hidden=%s, mem=%s, admin=%s, output_mode=%s",
@@ -559,13 +559,17 @@ function isMember () {
 	// is the cache entry there?
 	if (isset($GLOBALS['is_member'])) {
 		// Then return it
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS['is_member']) . ')');
 		return $GLOBALS['is_member'];
-	} elseif (getMemberId() == '0') {
+	} elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
 		// No member
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
 		return false;
 	} else {
-		// Transfer userid=>current
-		setCurrentUserid(getMemberId());
+		// Get it secured from session
+		setMemberId(getSession('userid'));
+		setCurrentUserId(getMemberId());
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getSession('userid') . ' used from cookie/session.');
 	}
 
 	// Init user data array
@@ -591,15 +595,17 @@ function isMember () {
 				$ret = true;
 			} else {
 				// Maybe got locked etc.
-				logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status'));
+				//* 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.');
 		destroyMemberSession();
 	}
 
@@ -607,6 +613,7 @@ function isMember () {
 	$GLOBALS['is_member'] = $ret;
 
 	// Return status
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
 	return $ret;
 }
 
@@ -698,7 +705,7 @@ function isAdmin ($adminLogin = '') {
 	$ret = false;
 	$passCookie = '';
 	$valPass = '';
-	//* DEBUG: */ print(__FUNCTION__.':'.$adminLogin.'<br />');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'<br />');
 
 	// If admin login is not given take current from cookies...
 	if ((empty($adminLogin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
@@ -706,7 +713,7 @@ function isAdmin ($adminLogin = '') {
 		$adminLogin = getSession('admin_login');
 		$passCookie = getSession('admin_md5');
 	} // END - if
-	//* DEBUG: */ print(__FUNCTION__.':'.$adminLogin.'/'.$passCookie.'<br />');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'/'.$passCookie.'<br />');
 
 	// Do we have cache?
 	if (!isset($GLOBALS['is_admin'][$adminLogin])) {
@@ -736,7 +743,7 @@ function isAdmin ($adminLogin = '') {
 
 		if (!empty($valPass)) {
 			// Check if password is valid
-			//* DEBUG: */ print(__FUNCTION__ . ':(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie).'<br />');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie));
 			$GLOBALS['is_admin'][$adminLogin] = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == '*FAILED*') && (!isExtensionActive('cache'))));
 		} // END - if
 	} // END - if
@@ -1312,7 +1319,7 @@ function updateReferalCounter ($userid) {
 	} elseif ((($ref == $userid) || ($ref == '0')) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) {
 		// Remove cache here
 		//* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):ref={$ref} - CACHE!<br />");
-		rebuildCacheFile('refsystem', 'refsystem');
+		rebuildCache('refsystem', 'refsystem');
 	}
 
 	// "Walk" back here
@@ -1619,7 +1626,7 @@ function FILTER_ACTIVATE_EXCHANGE () {
 		updateConfiguration('activate_xchange' ,0);
 
 		// Rebuild cache
-		rebuildCacheFile('modules', 'modules');
+		rebuildCache('modules', 'modules');
 	} // END - if
 }