X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnudge.php;h=801d1f06810aa343dbfe78e2cb37e005db519cd8;hb=8d516d7f08c02f1144d2f43ffbf6536921fde29f;hp=19a84ee329f88c5aa569d7d2a24efc83b05f8c31;hpb=4737563b957e84ee06d07f373af533b2f037497a;p=quix0rs-gnu-social.git

diff --git a/actions/nudge.php b/actions/nudge.php
index 19a84ee329..801d1f0681 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -7,10 +7,10 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -40,11 +40,11 @@ require_once INSTALLDIR.'/lib/mail.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class NudgeAction extends Action
 {
@@ -60,30 +60,29 @@ class NudgeAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return;
         }
 
         $user  = common_current_user();
-        $other = User::staticGet('nickname', $this->arg('nickname'));
+        $other = User::getKV('nickname', $this->arg('nickname'));
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
             common_redirect(common_local_url('showstream',
                 array('nickname' => $other->nickname)));
-            return;
         }
 
         // CSRF protection
         $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->clientError(_('There was a problem with your session token. Try again, please.'));
-            return;
         }
 
         if (!$other->email || !$other->emailnotifynudge) {
-            $this->clientError(_('This user doesn\'t allow nudges or hasn\'t confirmed or set his email yet.'));
-            return;
+            // TRANS: Client error displayed trying to nudge a user that cannot be nudged.
+            $this->clientError(_('This user doesn\'t allow nudges or hasn\'t confirmed or set their email address yet.'));
         }
 
         $this->notify($user, $other);
@@ -91,12 +90,14 @@ class NudgeAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title after sending a nudge.
             $this->element('title', null, _('Nudge sent'));
             $this->elementEnd('head');
             $this->elementStart('body');
+            // TRANS: Confirmation text after sending a nudge.
             $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             // display a confirmation to the user
             common_redirect(common_local_url('showstream',
@@ -129,4 +130,3 @@ class NudgeAction extends Action
         return true;
     }
 }
-