harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finish implementing email verification. Currently it only applies if REGISTER_OPEN is in effect.

Browse Source
This commit is contained in:
friendica
2014-07-09 21:10:56 -07:00
parent c59cd91836
commit fa706c8e86
6 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/account.php
View File

@@ -254,6 +254,7 @@ function verify_email_address($arr) {
else
logger('send_reg_approval_email: failed to ' . $admin['email'] . 'account_id: ' . $arr['account']['account_id']);
return $res;
}
@@ -476,8 +477,14 @@ function user_approve($hash) {
intval(ACCOUNT_PENDING),
intval($register[0]['uid'])
);
$r = q("update account set account_flags = (account_flags ^ %d) where (account_flags & %d) and account_id = %d limit 1",
intval(ACCOUNT_UNVERIFIED),
intval(ACCOUNT_UNVERIFIED),
intval($register[0]['uid'])
);
info( t('Account approved.') . EOL );
info( t('Account verified. Please login.') . EOL );
return true;
}

7
include/auth.php
View File

@@ -35,13 +35,18 @@ function nuke_session() {
function account_verify_password($email,$pass) {
$email_verify = get_config('system','verify_email');
if($email_verify && $record['account_flags'] & ACCOUNT_UNVERIFIED)
return null;
$r = q("select * from account where account_email = '%s'",
dbesc($email)
);
if(! ($r && count($r)))
return null;
foreach($r as $record) {
if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED)
if(($record['account_flags'] == ACCOUNT_OK)
&& (hash('whirlpool',$record['account_salt'] . $pass) === $record['account_password'])) {
logger('password verified for ' . $email);
return $record;