Merge branch 'oauth-default-icon' into 'nightly'

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

diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index b3a939b431b2ab2427d1637d6f90d8df7160f4bd..35b50698609baa6ea84da23ddb641925e57e43aa 100644 (file)
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
-
 /**
  * Ouputs information for a user, specified by ID or screen name.
  * The user's most recent status will be returned inline.
@@ -49,8 +47,7 @@ require_once INSTALLDIR . '/lib/api.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 ApiAction
+class ApiUserShowAction extends ApiPrivateAuthAction
 {
     /**
      * Take arguments for running
@@ -60,8 +57,7 @@ class ApiUserShowAction extends ApiAction
      * @return boolean success flag
      *
      */
-
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -70,11 +66,17 @@ class ApiUserShowAction extends ApiAction
         // 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,44 +85,41 @@ class ApiUserShowAction extends ApiAction
      *
      * 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;
+            // TRANS: Client error displayed when coming across a non-supported API method.
+            $this->clientError(_('API method not found.'), 404);
         }
 
-        $profile = $this->user->getProfile();
-
-        if (empty($profile)) {
-            $this->clientError(_('User has no profile.'));
-            return;
-        }
-
-        $twitter_user = $this->twitterUserArray($this->user->getProfile(), true);
+        $twitter_user = $this->twitterUserArray($this->target, true);
 
         if ($this->format == 'xml') {
             $this->initDocument('xml');
-            $this->showTwitterXmlUser($twitter_user);
+            $this->showTwitterXmlUser($twitter_user, 'user', true);
             $this->endDocument('xml');
         } elseif ($this->format == 'json') {
             $this->initDocument('json');
             $this->showJsonObjects($twitter_user);
             $this->endDocument('json');
         }
-
     }
 
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
 }