From: Zach Copley Date: Thu, 14 Apr 2011 22:45:05 +0000 (-0700) Subject: * Show the right menus in the aside after successful registration X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=951ee1faff619dfeffba3f333a4970436346edab;p=quix0rs-gnu-social.git * Show the right menus in the aside after successful registration * Events surrounding successful registration output --- diff --git a/EVENTS.txt b/EVENTS.txt index 7819d9042b..5bf6078a1c 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -1375,3 +1375,9 @@ EndProfileGetAvatar: After getting an avatar for a profile - $profile: profile - $size: size of the avatar - &$avatar: avatar + +StartRegisterSuccess: Before showing the registration success message +- $action: the registration action + +StartRegisterSuccess: After showing the registration success message +- $action: the registration action diff --git a/actions/register.php b/actions/register.php index e5f3ef1080..f4ad38ef7c 100644 --- a/actions/register.php +++ b/actions/register.php @@ -605,48 +605,53 @@ class RegisterAction extends Action */ function showSuccessContent() { - $nickname = $this->arg('nickname'); - - $profileurl = common_local_url('showstream', - array('nickname' => $nickname)); - - $this->elementStart('div', 'success'); - // TRANS: Text displayed after successful account registration. - // TRANS: %1$s is the registered nickname, %2$s is the profile URL. - // TRANS: This message contains Markdown links in the form [link text](link) - // TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax. - $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '. - 'From here, you may want to...'. "\n\n" . - '* Go to [your profile](%2$s) '. - 'and post your first message.' . "\n" . - '* Add a [Jabber/GTalk address]'. - '(%%%%action.imsettings%%%%) '. - 'so you can send notices '. - 'through instant messages.' . "\n" . - '* [Search for people](%%%%action.peoplesearch%%%%) '. - 'that you may know or '. - 'that share your interests. ' . "\n" . - '* Update your [profile settings]'. - '(%%%%action.profilesettings%%%%)'. - ' to tell others more about you. ' . "\n" . - '* Read over the [online docs](%%%%doc.help%%%%)'. - ' for features you may have missed. ' . "\n\n" . - 'Thanks for signing up and we hope '. - 'you enjoy using this service.'), - $nickname, $profileurl); - - $this->raw(common_markup_to_html($instr)); - - $have_email = $this->trimmed('email'); - if ($have_email) { - // TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail. - $emailinstr = _('(You should receive a message by email '. - 'momentarily, with ' . - 'instructions on how to confirm '. - 'your email address.)'); - $this->raw(common_markup_to_html($emailinstr)); + if (Event::handle('onStartRegisterSuccess', array($this))) { + + $nickname = $this->arg('nickname'); + + $profileurl = common_local_url('showstream', + array('nickname' => $nickname)); + + $this->elementStart('div', 'success'); + // TRANS: Text displayed after successful account registration. + // TRANS: %1$s is the registered nickname, %2$s is the profile URL. + // TRANS: This message contains Markdown links in the form [link text](link) + // TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax. + $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '. + 'From here, you may want to...'. "\n\n" . + '* Go to [your profile](%2$s) '. + 'and post your first message.' . "\n" . + '* Add a [Jabber/GTalk address]'. + '(%%%%action.imsettings%%%%) '. + 'so you can send notices '. + 'through instant messages.' . "\n" . + '* [Search for people](%%%%action.peoplesearch%%%%) '. + 'that you may know or '. + 'that share your interests. ' . "\n" . + '* Update your [profile settings]'. + '(%%%%action.profilesettings%%%%)'. + ' to tell others more about you. ' . "\n" . + '* Read over the [online docs](%%%%doc.help%%%%)'. + ' for features you may have missed. ' . "\n\n" . + 'Thanks for signing up and we hope '. + 'you enjoy using this service.'), + $nickname, $profileurl); + + $this->raw(common_markup_to_html($instr)); + + $have_email = $this->trimmed('email'); + if ($have_email) { + // TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail. + $emailinstr = _('(You should receive a message by email '. + 'momentarily, with ' . + 'instructions on how to confirm '. + 'your email address.)'); + $this->raw(common_markup_to_html($emailinstr)); + } + $this->elementEnd('div'); + + Event::handle('onEndRegisterSuccess', array($this)); } - $this->elementEnd('div'); } /** @@ -656,15 +661,23 @@ class RegisterAction extends Action */ function showLocalNav() { - $nav = new LoginGroupNav($this); - $nav->show(); - } - - function showNoticeForm() - { + if (common_logged_in()) { + parent::showLocalNav(); + } else { + $nav = new LoginGroupNav($this); + $nav->show(); + } } + /** + * Show a bit of login context + * + * @return nothing + */ function showProfileBlock() { + if (common_logged_in()) { + parent::showProfileBlock(); + } } }