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

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

diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index 28993102c0065085def40ecdeae7297a7746efdc..04fcb7dd8961f500a259ae5dc9a42735632d3678 100644 (file)
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiprivateauth.php';
-
 /**
  * Ouputs information for a user, specified by ID or screen name.
  * The user's most recent status will be returned inline.
@@ -49,7 +47,6 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiUserShowAction extends ApiPrivateAuthAction
 {
     /**
@@ -60,8 +57,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction
      * @return boolean success flag
      *
      */
-
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -70,10 +66,16 @@ class ApiUserShowAction extends ApiPrivateAuthAction
         // XXX: email field deprecated in Twitter's API
 
         if (!empty($email)) {
-            $this->user = User::staticGet('email', $email);
+            $user = User::getKV('email', $email);
         } else {
-            $this->user = $this->getTargetUser($this->arg('id'));
+            $user = $this->getTargetUser($this->arg('id'));
+        }
+
+        if (!($user instanceof User)) {
+            // TRANS: Client error displayed when requesting user information for a non-existing user.
+            $this->clientError(_('User not found.'), 404);
         }
+        $this->target = $user->getProfile();
 
         return true;
     }
@@ -83,33 +85,18 @@ class ApiUserShowAction extends ApiPrivateAuthAction
      *
      * Check the format and show the user info
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
-
-        if (empty($this->user)) {
-            $this->clientError(_('Not found.'), 404, $this->format);
-            return;
-        }
+        parent::handle();
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(_('API method not found.'), $code = 404);
-            return;
-        }
-
-        $profile = $this->user->getProfile();
-
-        if (empty($profile)) {
-            $this->clientError(_('User has no profile.'));
-            return;
+            // TRANS: Client error displayed when coming across a non-supported API method.
+            $this->clientError(_('API method not found.'), 404);
         }
 
-        $twitter_user = $this->twitterUserArray($this->user->getProfile(), true);
+        $twitter_user = $this->twitterUserArray($this->target, true);
 
         if ($this->format == 'xml') {
             $this->initDocument('xml');
@@ -120,7 +107,6 @@ class ApiUserShowAction extends ApiPrivateAuthAction
             $this->showJsonObjects($twitter_user);
             $this->endDocument('json');
         }
-
     }
 
     /**
@@ -132,10 +118,8 @@ class ApiUserShowAction extends ApiPrivateAuthAction
      *
      * @return boolean is read only action?
      */
-
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
-
 }