X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapiusershow.php;h=6c8fad49ba9f5caac1ea15fb73867606a0f4d056;hb=792f0942f761fe8b29363689eb7cbe4317f64b96;hp=2e2ceab41bb83736593d35a511d8b334ea33013b;hpb=eaef9b689ab41eed23eb74841ed5038066c485a3;p=quix0rs-gnu-social.git

diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index 2e2ceab41b..6c8fad49ba 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    mac65 <mac65@mac65.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Ouputs information for a user, specified by ID or screen name.
@@ -39,17 +42,16 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   mac65 <mac65@mac65.com>
  * @author   Zach Copley <zach@status.net>
  * @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 TwitterApiAction
+class ApiUserShowAction extends ApiPrivateAuthAction
 {
-
-    var $format = null;
-    var $user   = null;
-
     /**
      * Take arguments for running
      *
@@ -63,8 +65,6 @@ class ApiUserShowAction extends TwitterApiAction
     {
         parent::prepare($args);
 
-        $this->format = $this->arg('format');
-
         $email = $this->arg('email');
 
         // XXX: email field deprecated in Twitter's API
@@ -98,7 +98,7 @@ class ApiUserShowAction extends TwitterApiAction
         }
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             return;
         }
 
@@ -109,18 +109,33 @@ class ApiUserShowAction extends TwitterApiAction
             return;
         }
 
-        $twitter_user = $this->twitter_user_array($this->user->getProfile(), true);
+        $twitter_user = $this->twitterUserArray($this->user->getProfile(), true);
 
         if ($this->format == 'xml') {
-            $this->init_document('xml');
-            $this->show_twitter_xml_user($twitter_user);
-            $this->end_document('xml');
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user);
+            $this->endDocument('xml');
         } elseif ($this->format == 'json') {
-            $this->init_document('json');
-            $this->show_json_objects($twitter_user);
-            $this->end_document('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;
+    }
+
 }