Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / addpeopletag.php

diff --git a/actions/addpeopletag.php b/actions/addpeopletag.php
index 3176a116c909d37e6e51388f8b3b32a8c456ffb4..56bb206dc44016aeacbd7f062312ccc371934ae0 100644 (file)
--- a/actions/addpeopletag.php
+++ b/actions/addpeopletag.php
@@ -34,9 +34,9 @@ if (!defined('STATUSNET')) {
 require_once INSTALLDIR . '/lib/togglepeopletag.php';
 
 /**
- *  
+ *
  * Action to tag a profile with a single tag.
- * 
+ *
  * Takes parameters:
  *
  *    - tagged: the ID of the profile being tagged
@@ -52,7 +52,6 @@ require_once INSTALLDIR . '/lib/togglepeopletag.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link      http://status.net/
  */
-
 class AddpeopletagAction extends Action
 {
     var $user;
@@ -66,8 +65,7 @@ class AddpeopletagAction extends Action
      *
      * @return boolean success flag
      */
-
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -76,9 +74,9 @@ class AddpeopletagAction 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;
         }
 
         // Only for logged-in users
@@ -86,38 +84,27 @@ class AddpeopletagAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return false;
         }
 
         // Profile to subscribe to
 
         $tagged_id = $this->arg('tagged');
 
-        $this->tagged = Profile::staticGet('id', $tagged_id);
+        $this->tagged = Profile::getKV('id', $tagged_id);
 
         if (empty($this->tagged)) {
+            // TRANS: Client error displayed trying to perform an action related to a non-existing profile.
             $this->clientError(_('No such profile.'));
-            return false;
         }
 
         $id = $this->arg('peopletag_id');
-        $this->peopletag = Profile_list::staticGet('id', $id);
+        $this->peopletag = Profile_list::getKV('id', $id);
 
         if (empty($this->peopletag)) {
-            $this->clientError(_('No such peopletag.'));
-            return false;
-        }
-
-        // OMB 0.1 doesn't have a mechanism for local-server-
-        // originated tag.
-
-        $omb01 = Remote_profile::staticGet('id', $tagged_id);
-
-        if (!empty($omb01)) {
-            $this->clientError(_('You cannot tag an OMB 0.1'.
-                                 ' remote profile with this action.'));
-            return false;
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'));
         }
 
         return true;
@@ -132,37 +119,40 @@ class AddpeopletagAction extends Action
      *
      * @return void
      */
-
-    function handle($args)
+    function handle(array $args=array())
     {
-
         // Throws exception on error
         $ptag = Profile_tag::setTag($this->user->id, $this->tagged->id,
                                 $this->peopletag->tag);
 
         if (!$ptag) {
-            $user = User::staticGet('id', $id);
-            if ($user) {
+            $user = User::getKV('id', $id);
+
+            if ($user instanceof User) {
                 $this->clientError(
-                        sprintf(_('There was an unexpected error while tagging %s'),
+                        // TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+                        // TRANS: %s is a username.
+                        sprintf(_('There was an unexpected error while listing %s.'),
                         $user->nickname));
             } else {
-                $this->clientError(sprintf(_('There was a problem tagging %s.' .
-                                      'The remote server is probably not responding correctly, ' .
-                                      'please try retrying later.'), $this->profile->profileurl));
+                // TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+                // TRANS: %s is a profile URL.
+                $this->clientError(sprintf(_('There was a problem listing %s. ' .
+                                      'The remote server is probably not responding correctly. ' .
+                                      'Please try retrying later.'), $this->profile->profileurl));
             }
-            return false;
         }
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, _('Subscribed'));
+            // TRANS: Title after adding a user to a list.
+            $this->element('title', null, _m('TITLE','Listed'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $unsubscribe = new UntagButton($this, $this->tagged, $this->peopletag);
             $unsubscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('subscriptions',
                                     array('nickname' => $this->user->nickname));