X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribepeopletag.php;h=ed9f282cfdd241bf504cdc539dab6f3c30cc5618;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=e38ecb2d3ee51d2a2ee8c5437c3eb451d16fe8ac;hpb=4d61760154a53e39d1e0499d5fe7a4a586e7a9f0;p=quix0rs-gnu-social.git

diff --git a/actions/subscribepeopletag.php b/actions/subscribepeopletag.php
index e38ecb2d3e..ed9f282cfd 100644
--- a/actions/subscribepeopletag.php
+++ b/actions/subscribepeopletag.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class SubscribepeopletagAction extends Action
 {
     var $peopletag = null;
@@ -51,20 +50,19 @@ class SubscribepeopletagAction extends Action
     /**
      * Prepare to run
      */
-
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            $this->clientError(_('You must be logged in to unsubscribe to a peopletag.'));
-            return false;
+            // TRANS: Client error displayed when trying to perform an action while not logged in.
+            $this->clientError(_('You must be logged in to unsubscribe from a list.'));
         }
         // Only allow POST requests
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            // TRANS: Client error displayed when trying to use another method than POST.
             $this->clientError(_('This action only accepts POST requests.'));
-            return false;
         }
 
         // CSRF protection
@@ -72,9 +70,9 @@ class SubscribepeopletagAction extends Action
         $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 false;
         }
 
         $tagger_arg = $this->trimmed('tagger');
@@ -82,18 +80,18 @@ class SubscribepeopletagAction extends Action
 
         $id = intval($this->arg('id'));
         if ($id) {
-            $this->peopletag = Profile_list::staticGet('id', $id);
+            $this->peopletag = Profile_list::getKV('id', $id);
         } else {
+            // TRANS: Client error displayed when trying to perform an action without providing an ID.
             $this->clientError(_('No ID given.'), 404);
-            return false;
         }
 
         if (!$this->peopletag || $this->peopletag->private) {
-            $this->clientError(_('No such peopletag.'), 404);
-            return false;
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'), 404);
         }
 
-        $this->tagger = Profile::staticGet('id', $this->peopletag->tagger);
+        $this->tagger = Profile::getKV('id', $this->peopletag->tagger);
 
         return true;
     }
@@ -108,7 +106,7 @@ class SubscribepeopletagAction extends Action
      * @return void
      */
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -117,14 +115,18 @@ class SubscribepeopletagAction extends Action
         try {
             Profile_tag_subscription::add($this->peopletag, $cur);
         } catch (Exception $e) {
-            $this->serverError(sprintf(_('Could not subscribe user %1$s to peopletag %2$s.'),
-                                       $cur->nickname, $this->peopletag->tag) . ' ' . $e->getMessage());
+            // TRANS: Server error displayed subscribing to a list fails.
+            // TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
+            $this->serverError(sprintf(_('Could not subscribe user %1$s to list %2$s: %3$s'),
+                                       $cur->nickname, $this->peopletag->tag), $e->getMessage());
         }
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, sprintf(_('%1$s subscribed to peopletag %2$s by %3$s'),
+            // TRANS: Title of form to subscribe to a list.
+            // TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
+            $this->element('title', null, sprintf(_('%1$s subscribed to list %2$s by %3$s'),
                                                   $cur->nickname,
                                                   $this->peopletag->tag,
                                                   $this->tagger->nickname));
@@ -133,7 +135,7 @@ class SubscribepeopletagAction extends Action
             $lf = new UnsubscribePeopletagForm($this, $this->peopletag);
             $lf->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('peopletagsubscribers',
                                 array('tagger' => $this->tagger->nickname,