on failed auth due to unverified email, tell the person why and remind them to check their email.

This commit is contained in:
zotlabs 2017-10-10 19:45:11 -07:00
parent 769da564e2
commit 1a7ccc462b

View file

@ -83,7 +83,7 @@ function account_verify_password($login, $pass) {
if(($email_verify) && ($register_policy == REGISTER_OPEN) && ($account['account_flags'] & ACCOUNT_UNVERIFIED)) { if(($email_verify) && ($register_policy == REGISTER_OPEN) && ($account['account_flags'] & ACCOUNT_UNVERIFIED)) {
logger('email verification required for ' . $login); logger('email verification required for ' . $login);
return null; return ( [ 'reason' => 'unvalidated' ] );
} }
if(($account['account_flags'] == ACCOUNT_OK) if(($account['account_flags'] == ACCOUNT_OK)
@ -259,7 +259,10 @@ else {
} }
else { else {
$verify = account_verify_password($_POST['username'], $_POST['password']); $verify = account_verify_password($_POST['username'], $_POST['password']);
if($verify) { if($verify && array_key_exists('reason',$verify) && $verify['reason'] === 'unvalidated') {
notice( t('Email validation is incomplete. Please check your email.'));
}
elseif($verify) {
$atoken = $verify['xchan']; $atoken = $verify['xchan'];
$channel = $verify['channel']; $channel = $verify['channel'];
$account = App::$account = $verify['account']; $account = App::$account = $verify['account'];