diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-19 18:48:11 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-19 18:48:11 -0700 |
| commit | 400441d56b21e69663ea7213ccf63fe0ee6a6bab (patch) | |
| tree | 147abc23613d8013eaccca6335c0dcb98cbf329b | |
| parent | 7d92e9026e55d0e67cab237c5ced39480074a7f6 (diff) | |
| download | volse-hubzilla-400441d56b21e69663ea7213ccf63fe0ee6a6bab.tar.gz volse-hubzilla-400441d56b21e69663ea7213ccf63fe0ee6a6bab.tar.bz2 volse-hubzilla-400441d56b21e69663ea7213ccf63fe0ee6a6bab.zip | |
register workflow was getting over-ridden in include/security
| -rw-r--r-- | Zotlabs/Module/New_channel.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Register.php | 9 |
2 files changed, 6 insertions, 5 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 9a364e154..9cf0960c0 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -123,13 +123,13 @@ 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']); } - if($res) { - info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ; - } } elseif($policy == REGISTER_APPROVE) { $res = send_reg_approval_email($result); @@ -167,7 +167,8 @@ class Register extends \Zotlabs\Web\Controller { $next_page = $x; $_SESSION['workflow'] = true; } - + + unset($_SESSION['login_return_url']); goaway(z_root() . '/' . $next_page); } |