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

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

diff --git a/actions/removepeopletag.php b/actions/removepeopletag.php
index aa8ae2b6ad469091efddb67d9494788cc8a421f5..ee33517fdab1606e8c711487cc8209f6209c995c 100644 (file)
--- a/actions/removepeopletag.php
+++ b/actions/removepeopletag.php
@@ -53,7 +53,6 @@ require_once INSTALLDIR . '/lib/togglepeopletag.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link      http://status.net/
  */
-
 class RemovepeopletagAction extends Action
 {
     var $user;
@@ -67,8 +66,7 @@ class RemovepeopletagAction extends Action
      *
      * @return boolean success flag
      */
-
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -77,9 +75,9 @@ class RemovepeopletagAction 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
@@ -87,38 +85,27 @@ class RemovepeopletagAction 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 when referring 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 or untag 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;
@@ -133,8 +120,7 @@ class RemovepeopletagAction extends Action
      *
      * @return void
      */
-
-    function handle($args)
+    function handle(array $args=array())
     {
         // Throws exception on error
 
@@ -142,28 +128,32 @@ class RemovepeopletagAction extends Action
                                 $this->peopletag->tag);
 
         if (!$ptag) {
-            $user = User::staticGet('id', $this->tagged->id);
-            if ($user) {
+            $user = User::getKV('id', $this->tagged->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 while delisting a user.
+                        // TRANS: %s is a username.
+                        sprintf(_('There was an unexpected error while delisting %s.'),
                         $user->nickname));
             } else {
-                $this->clientError(sprintf(_('There was a problem tagging %s.' .
+                // TRANS: Client error displayed when an unknown error occurs while listing a user.
+                // 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, _('Untagged'));
+            // TRANS: Title after removing a user from a list.
+            $this->element('title', null, _('Unlisted'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $unsubscribe = new TagButton($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));