diff options
| author | Mario <mario@mariovavti.com> | 2021-03-19 11:43:48 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-19 11:43:48 +0100 |
| commit | 06d47deef80d19230ee6c801c97c3e8913012671 (patch) | |
| tree | 8acbba20ba38c45460ac6106b9e7e610e2a07a0b /Zotlabs/Module/Regate.php | |
| parent | 85d000e7920ec5ab56bc33e2e4b2d86036fee830 (diff) | |
| download | volse-hubzilla-06d47deef80d19230ee6c801c97c3e8913012671.tar.gz volse-hubzilla-06d47deef80d19230ee6c801c97c3e8913012671.tar.bz2 volse-hubzilla-06d47deef80d19230ee6c801c97c3e8913012671.zip | |
air: improved UX by changing the registration workflow so that it is not required to go back to registration and post the DID. If no registration delay is configured proceed directly to verification. fixes #1540
Diffstat (limited to 'Zotlabs/Module/Regate.php')
| -rw-r--r-- | Zotlabs/Module/Regate.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php index 7379a6662..077e5fd54 100644 --- a/Zotlabs/Module/Regate.php +++ b/Zotlabs/Module/Regate.php @@ -122,6 +122,7 @@ class Regate extends \Zotlabs\Web\Controller { if ( ($flags & ACCOUNT_PENDING ) == ACCOUNT_PENDING ) { $msg .= "\n".t('Last step will be by an instance admin to agree your account request'); + $nextpage = 'regapr/' . bin2hex($did2); q("COMMIT"); } elseif ( ($flags ^ REGISTER_AGREED) == 0) { @@ -235,6 +236,10 @@ class Regate extends \Zotlabs\Web\Controller { $nowfmt = $isduty['nowfmt']; $atform = $isduty['atform']; + $pin = $_SESSION['zar']['pin'] ?? ''; + unset($_SESSION['zar']['pin']); + + $title = t('Register Verification'); // do we have a valid dId2 ? @@ -298,7 +303,7 @@ class Regate extends \Zotlabs\Web\Controller { $o = replace_macros(get_markup_template('regate.tpl'), [ '$form_security_token' => get_form_security_token("regate"), '$title' => $title, - '$desc' => t('You were given a validation token. Please enter that token here to continue the register verification step and allow some delay for proccessing.'), + '$desc' => $pin ? t('Please enter your validation token') . '<code class="inline">' . $pin . '</code>' : t('You were given a validation token. Please enter that token here to verify your registration.'), '$did2' => bin2hex($did2) . $didx, '$now' => $nowfmt, '$atform' => $atform, |