diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-22 19:32:08 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-22 19:32:08 -0700 |
| commit | c49eec71f0995cd75be99a64a4dde398f9f0241b (patch) | |
| tree | 06e29769c32460299d9c73794028e657e362b6e2 /Zotlabs/Module/Register.php | |
| parent | cdb1bc9be6fbc09caff62c0153386cc58a2bfbd9 (diff) | |
| parent | b58bf75f21d15ac440bb3a90edb29afac9eb64ba (diff) | |
| download | volse-hubzilla-c49eec71f0995cd75be99a64a4dde398f9f0241b.tar.gz volse-hubzilla-c49eec71f0995cd75be99a64a4dde398f9f0241b.tar.bz2 volse-hubzilla-c49eec71f0995cd75be99a64a4dde398f9f0241b.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Register.php')
| -rw-r--r-- | Zotlabs/Module/Register.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 9a364e154..95e3ca96f 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -123,12 +123,19 @@ 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 ) ; + if($invite_code) { + info( t('Registration successful. Continue to create your first channel...') . EOL ) ; + } else { + info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ; + } } } elseif($policy == REGISTER_APPROVE) { @@ -167,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); } |