From 36678d1b90dc69a2928bb3895c16b37701f89c88 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 19 Oct 2017 18:48:11 -0700 Subject: register workflow was getting over-ridden in include/security --- Zotlabs/Module/New_channel.php | 2 +- Zotlabs/Module/Register.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index cfd45e909..2b73fa191 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -9,7 +9,7 @@ require_once('include/permissions.php'); class New_channel extends \Zotlabs\Web\Controller { function init() { - + $cmd = ((argc() > 1) ? argv(1) : ''); if($cmd === 'autofill.json') { diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index b026dc4c6..95e3ca96f 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -123,6 +123,9 @@ class Register extends \Zotlabs\Web\Controller { if($policy == REGISTER_OPEN ) { if($email_verify) { $res = verify_email_address($result); + if($res) { + info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ; + } } else { $res = send_register_success_email($result['email'],$result['password']); @@ -171,7 +174,8 @@ class Register extends \Zotlabs\Web\Controller { $next_page = $x; $_SESSION['workflow'] = true; } - + + unset($_SESSION['login_return_url']); goaway(z_root() . '/' . $next_page); } -- cgit v1.2.3