Merge branch 'testing' of gitorious.org:statusnet/mainline

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

diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index b9c9bf0f725d1e0ef7c40ad0b6e29996e66aa55e..1095d5162634f312772ce78e4e533dc2a2eaf00a 100644 (file)
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Robin Millette <robin@millette.info>
  * @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 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Check a user's credentials. Returns an HTTP 200 OK response code and a
@@ -40,6 +42,8 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <robin@millette.info>
  * @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/
@@ -47,30 +51,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiAccountVerifyCredentialsAction extends ApiAuthAction
 {
-    var $format                = null;
-
-    /**
-     * Take arguments for running
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
-     *
-     */
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return false;
-            }
-        }
-
-        $this->format = $this->arg('format');
-        return true;
-    }
 
     /**
      * Handle the request
@@ -91,8 +71,9 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
         case 'json':
             $args['id'] = $this->auth_user->id;
             $action_obj = new ApiUserShowAction();
-            $action_obj->prepare($args);
-            $action_obj->handle($args);
+            if ($action_obj->prepare($args)) {
+                $action_obj->handle($args);
+            }
             break;
         default:
             header('Content-Type: text/html; charset=utf-8');
@@ -101,4 +82,18 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
 
     }
 
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     * 
+     * @return boolean true
+     *
+     **/
+    
+    function isReadOnly($args)
+    {
+        return true;
+    }
+    
 }