aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Email_validation.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-29 22:44:38 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-29 22:44:38 +0100
commit296117124c530ce7533431e6bb8a7958b89f7f51 (patch)
treef4cac99084f605059e830d4713926bf39fc13593 /Zotlabs/Module/Email_validation.php
parent0d21c6f86361d723175357b9584ca69d4a62e0a4 (diff)
parente4eff6a32bd6b9907c5c1a4454e5861f3712d380 (diff)
downloadvolse-hubzilla-296117124c530ce7533431e6bb8a7958b89f7f51.tar.gz
volse-hubzilla-296117124c530ce7533431e6bb8a7958b89f7f51.tar.bz2
volse-hubzilla-296117124c530ce7533431e6bb8a7958b89f7f51.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Email_validation.php')
-rw-r--r--Zotlabs/Module/Email_validation.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php
index 4cc016847..b8bb720cd 100644
--- a/Zotlabs/Module/Email_validation.php
+++ b/Zotlabs/Module/Email_validation.php
@@ -8,9 +8,18 @@ class Email_validation extends \Zotlabs\Web\Controller {
function post() {
if($_POST['token']) {
- if(! account_approve(trim($_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(get_config('system','auto_channel_create')) {
+ $next_page = get_config('system', 'workflow_channel_next', 'profiles');
+ }
+ if($next_page) {
+ goaway(z_root() . '/' . $next_page);
+ }
+ }
}
}