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

several email validation issues

Browse Source
This commit is contained in:
zotlabs 2018-02-28 21:15:26 -08:00
parent 2b910eb5aa
commit 01015bc0d5
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Module/Email_validation.php
View File

@ -7,12 +7,11 @@ class Email_validation extends \Zotlabs\Web\Controller {
function post() { function post() {
$success = false;
if($_POST['token']) { if($_POST['token']) {
// This will redirect internally on success unless the channel is auto_created // This will redirect internally on success unless the channel is auto_created
if(! account_approve(trim(basename($_POST['token'])))) { if(account_approve(trim(basename($_POST['token'])))) {
notice('Token verification failed.'); $success = true;
}
else {
if(get_config('system','auto_channel_create')) { if(get_config('system','auto_channel_create')) {
$next_page = get_config('system', 'workflow_channel_next', 'profiles'); $next_page = get_config('system', 'workflow_channel_next', 'profiles');
} }
@ -21,7 +20,9 @@ class Email_validation extends \Zotlabs\Web\Controller {
} }
} }
} }
if(! $success) {
notice( t('Token verification failed.') . EOL);
}
} }

2
include/account.php
View File

@ -530,7 +530,7 @@ function account_deny($hash) {
function account_approve($hash) { function account_approve($hash) {
$ret = array('success' => false); $ret = false;
// Note: when the password in the register table is 'verify', the uid actually contains the account_id // Note: when the password in the register table is 'verify', the uid actually contains the account_id

10
view/tpl/email_validation.tpl
View File

@ -2,15 +2,15 @@
<div class="descriptive-paragraph" style="font-size: 1.2em;"><p>{{$desc}}</p></div> <div class="descriptive-paragraph" style="font-size: 1.2em;"><p>{{$desc}}</p></div>
<form action="email_validation" method="post"> <form action="email_validation/{{$email}}" method="post">
{{include file="field_input.tpl" field=$token}} {{include file="field_input.tpl" field=$token}}
<div class="pull-right"> <div class="pull-right submit-wrapper">
<a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a>
</div>
<div class="submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div> </div>
<div class="resend-email" >
<a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a>
</div>
</form> </form>
<div class="clear"></div> <div class="clear"></div>