X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=45c71c66b3db7944312189b2c7186885f2598f80;hb=f1ee5f48d4a0bb2f293c6c9a38ba71cbeb9d14fa;hp=b7b96bdc0bb7f3f047c2ede73dd29a8eeb3a075e;hpb=5ec4a4e6deb5d28cbfab54093f8b4180912738d4;p=friendica.git

diff --git a/include/auth.php b/include/auth.php
index b7b96bdc0b..45c71c66b3 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -49,7 +49,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		}
 
 		$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
-		FROM `user` WHERE `uid` = %d LIMIT 1",
+		FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
 			intval($_SESSION['uid'])
 		);
 
@@ -104,11 +104,12 @@ else {
 	if((x($_POST,'password')) && strlen($_POST['password']))
 		$encrypted = hash('whirlpool',trim($_POST['password']));
 	else {
-		if((x($_POST,'openid_url')) && strlen($_POST['openid_url'])) {
+		if((x($_POST,'openid_url')) && strlen($_POST['openid_url']) ||
+		   (x($_POST,'username')) && strlen($_POST['username'])) {
 
 			$noid = get_config('system','no_openid');
 
-			$openid_url = trim($_POST['openid_url']);
+			$openid_url = trim(  (strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
 
 			// validate_url alters the calling parameter
 
@@ -161,7 +162,7 @@ else {
 		$record = null;
 
 		$addon_auth = array(
-			'username' => trim($_POST['openid_url']), 
+			'username' => trim($_POST['username']), 
 			'password' => trim($_POST['password']),
 			'authenticated' => 0,
 			'user_record' => null
@@ -186,9 +187,9 @@ else {
 
 			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`  
 				FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
-				AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
-				dbesc(trim($_POST['openid_url'])),
-				dbesc(trim($_POST['openid_url'])),
+				AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+				dbesc(trim($_POST['username'])),
+				dbesc(trim($_POST['username'])),
 				dbesc($encrypted)
 			);
 			if(count($r))
@@ -196,7 +197,7 @@ else {
 		}
 
 		if((! $record) || (! count($record))) {
-			logger('authenticate: failed login attempt: ' . trim($_POST['openid_url'])); 
+			logger('authenticate: failed login attempt: ' . trim($_POST['username'])); 
 			notice( t('Login failed.') . EOL );
 			goaway(z_root());
   		}