Don't send multiple error responses in ApiMediaUpload :)

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

diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index 1095d5162634f312772ce78e4e533dc2a2eaf00a..9b98fa6d810ba384fbea24599c7f47ae4285c3bc 100644 (file)
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Check a user's credentials. Returns an HTTP 200 OK response code and a
  * representation of the requesting user if authentication was successful;
@@ -48,36 +46,27 @@ require_once INSTALLDIR . '/lib/apiauth.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 ApiAccountVerifyCredentialsAction extends ApiAuthAction
 {
+    protected function handle()
+    {
+        parent::handle();
 
-    /**
-     * Handle the request
-     *
-     * Check whether the credentials are valid and output the result
-     *
-     * @param array $args $_REQUEST data (unused)
-     *
-     * @return void
-     */
+        if (!in_array($this->format, array('xml', 'json'))) {
+            // TRANS: Client error displayed when coming across a non-supported API method.
+            $this->clientError(_('API method not found.'), $code = 404);
+        }
 
-    function handle($args)
-    {
-        parent::handle($args);
+        $twitter_user = $this->twitterUserArray($this->auth_user->getProfile(), true);
 
-        switch ($this->format) {
-        case 'xml':
-        case 'json':
-            $args['id'] = $this->auth_user->id;
-            $action_obj = new ApiUserShowAction();
-            if ($action_obj->prepare($args)) {
-                $action_obj->handle($args);
-            }
-            break;
-        default:
-            header('Content-Type: text/html; charset=utf-8');
-            print 'Authorized';
+        if ($this->format == 'xml') {
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user, 'user', true);
+            $this->endDocument('xml');
+        } elseif ($this->format == 'json') {
+            $this->initDocument('json');
+            $this->showJsonObjects($twitter_user);
+            $this->endDocument('json');
         }
 
     }
@@ -86,14 +75,11 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
      * Is this action read only?
      *
      * @param array $args other arguments
-     * 
-     * @return boolean true
      *
-     **/
-    
+     * @return boolean true
+     */
     function isReadOnly($args)
     {
         return true;
     }
-    
 }