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

23
mod/register.php
View File

@@ -52,14 +52,17 @@ function register_post(&$a) {
$policy = get_config('system','register_policy');
$email_verify = get_config('system','verify_email');
switch($policy) {
case REGISTER_OPEN:
$flags = ACCOUNT_UNVERIFIED;
$flags = ACCOUNT_OK;
break;
case REGISTER_APPROVE:
$flags = ACCOUNT_UNVERIFIED | ACCOUNT_BLOCKED | ACCOUNT_PENDING;
$flags = ACCOUNT_BLOCKED | ACCOUNT_PENDING;
break;
default:
@@ -68,10 +71,13 @@ function register_post(&$a) {
notice( t('Permission denied.') . EOL );
return;
}
$flags = ACCOUNT_UNVERIFIED | ACCOUNT_BLOCKED;
$flags = ACCOUNT_BLOCKED;
break;
}
if($email_verify)
$flags = $flags | ACCOUNT_UNVERIFIED;
if((! $_POST['password']) || ($_POST['password'] !== $_POST['password2'])) {
notice( t('Passwords do not match.') . EOL);
@@ -100,7 +106,12 @@ function register_post(&$a) {
}
if($policy == REGISTER_OPEN ) {
$res = send_verification_email($result['email'],$result['password']);
if($email_verify) {
$res = verify_email_address($result);
}
else {
$res = send_verification_email($result['email'],$result['password']);
}
if($res) {
info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
}
@@ -116,6 +127,10 @@ function register_post(&$a) {
goaway(z_root());
}
if($email_verify) {
goaway(z_root());
}
authenticate_success($result['account'],true,false,true);
if(! strlen($next_page = get_config('system','workflow_register_next')))