X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fregister.php;h=3fe5e20a131479d94d4818ff9e3e7b6692c84a5f;hb=8cc5c175daa9571c9cc214d9d3e286c3d06a4760;hp=7b3c075156ec4103d2364896106eabe54dfec0d8;hpb=31c1177970124cee31823cab3a11542c23b4126d;p=quix0rs-gnu-social.git

diff --git a/actions/register.php b/actions/register.php
index 7b3c075156..3fe5e20a13 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -160,6 +160,7 @@ class RegisterAction extends Action
         if (Event::handle('StartRegistrationTry', array($this))) {
             $token = $this->trimmed('token');
             if (!$token || $token != common_session_token()) {
+                // TRANS: Client error displayed when the session token does not match or is not given.
                 $this->showForm(_('There was a problem with your session token. '.
                                   'Try again, please.'));
                 return;
@@ -211,6 +212,7 @@ class RegisterAction extends Action
                 // TRANS: Form validation error displayed when trying to register with an invalid nickname.
                 $this->showForm(_('Not a valid nickname.'));
             } else if ($this->emailExists($email)) {
+                // TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
                 $this->showForm(_('Email address already exists.'));
             } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
                        !Validate::uri($homepage,
@@ -268,11 +270,11 @@ class RegisterAction extends Action
                     common_rememberme($user);
                 }
 
-                Event::handle('EndRegistrationTry', array($this));
-
                 // Re-init language env in case it changed (not yet, but soon)
                 common_init_language();
 
+                Event::handle('EndRegistrationTry', array($this));
+
                 $this->showSuccess();
             } else {
                 // TRANS: Form validation error displayed when trying to register with an invalid username or password.
@@ -531,7 +533,7 @@ class RegisterAction extends Action
             $this->elementEnd('li');
         }
         $this->elementEnd('ul');
-        // TRANS: Field label on account registration page.
+        // TRANS: Button text to register a user on account registration page.
         $this->submit('submit', _m('BUTTON','Register'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
@@ -603,48 +605,52 @@ 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('StartRegisterSuccess', 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('EndRegisterSuccess', array($this));
         }
-        $this->elementEnd('div');
     }
 
     /**
@@ -654,15 +660,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();
+        }
     }
 }