X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=74ba0ce258a39acad47cd8aa6d384cbe224d6128;hp=f391b42a8c16bf03071cd51cab8f69b7ebaa0276;hb=831c60d4cec333ea95e0ce23d9e53fd5d8133ce6;hpb=dc1d66c49b8cb1e4fb8056d46b9c7e3fecd0ffdd

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index f391b42a8c..74ba0ce258 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -67,7 +67,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 	$data = array();
 
 	// Is the cache valid?
-	if (!empty($cacheArray['admins']['aid'][$admin_login])) {
+	if (!empty($cacheArray['admins']['password'][$admin_login])) {
 		// Get password from cache
 		$data['password'] = $cacheArray['admins']['password'][$admin_login];
 		$ret = "pass";
@@ -79,7 +79,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 			$data['login_failtures'] = $cacheArray['admins']['login_failtures'][$admin_login];
 			$data['last_failture']   = $cacheArray['admins']['last_failture'][$admin_login];
 		} // END - if
-	} elseif (GET_EXT_VERSION("cache") == "") {
+	} elseif (EXT_IS_ACTIVE("cache")) {
 		$ADD = "";
 		if (GET_EXT_VERSION("admins") >= "0.7.0") {
 			// Load them here
@@ -122,7 +122,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 
 	// Check if password is same
 	//* DEBUG: */ echo "*".$ret.",".$data['password'].",".$password.",".$salt."*<br >\n";
-	if (($ret == "pass") && ($data['password'] == generateHash($password, $salt)) && (!empty($salt))) {
+	if (($ret == "pass") && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) {
 		// Re-hash the plain passord with new random salt
 		$data['password'] = generateHash($password);