X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=e967ca4cf21580c678c1255b0ce80d6e33875a53;hp=3fd3570e6c1ba9207889046c1d18ef453fe388cf;hb=0da4efca52cd97ed8b385d81ae03125698f55e93;hpb=b1cf96c4a5a63a1d334119a0681e5fbf68edf527

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 3fd3570e6c..e967ca4cf2 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -281,20 +281,23 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 	);
 
 	// Check login data
-	if ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) {
+	if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) {
 		// Nickname entered
 		fetchUserData($userid, 'nickname');
+	} elseif (isNicknameUsed($userid)) {
+		// No nickname installed
+		$errorCode = getCode('EXTENSION_PROBLEM');
 	} else {
 		// Direct userid entered
 		fetchUserData($userid);
 	}
 
-	// Load entry
-	$content = getUserDataArray();
-	if (!empty($content['userid'])) $userid = bigintval($content['userid']);
-
 	// Is there an entry?
-	if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $userid))) {
+	if (((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) || ($content['userid'] == $userid)) {
+		// Load entry
+		$content = getUserDataArray();
+		if (!empty($content['userid'])) $userid = bigintval($content['userid']);
+
 		// Check for old MD5 passwords
 		if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) {
 			// Just set the hash to the password from DB... :)
@@ -372,7 +375,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 			// Wrong password!
 			$errorCode = getCode('WRONG_PASS');
 		}
-	} elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $userid)) {
+	} elseif (((isExtensionActive('nickname')) && (isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $userid)) {
 		// Other account status?
 		if (fetchUserData($userid)) {
 			// Create an error code from given status