aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Email_validation.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-03-01 08:38:17 +0100
committerMario Vavti <mario@mariovavti.com>2018-03-01 08:38:17 +0100
commit844bef5070b071aa5ddf823036d2fe2285b40a7b (patch)
tree129a67cbed69c4ed6f286e9a0bf3770b9c82ffc6 /Zotlabs/Module/Email_validation.php
parent97e329906e3cde0bacafcceb94780bedd44f1f32 (diff)
parent6210b7727f6c8542daaa62d1ed7f9ec1f74323f2 (diff)
downloadvolse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.tar.gz
volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.tar.bz2
volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.zip
Merge branch 'dev' into 3.2RC
Diffstat (limited to 'Zotlabs/Module/Email_validation.php')
-rw-r--r--Zotlabs/Module/Email_validation.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php
index b8bb720cd..c1ba9a01a 100644
--- a/Zotlabs/Module/Email_validation.php
+++ b/Zotlabs/Module/Email_validation.php
@@ -7,12 +7,11 @@ class Email_validation extends \Zotlabs\Web\Controller {
function post() {
+ $success = false;
if($_POST['token']) {
// This will redirect internally on success unless the channel is auto_created
- if(! account_approve(trim(basename($_POST['token'])))) {
- notice('Token verification failed.');
- }
- else {
+ if(account_approve(trim(basename($_POST['token'])))) {
+ $success = true;
if(get_config('system','auto_channel_create')) {
$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);
+ }
}