Merge branch 'openid-plugin' into 'nightly'

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

diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index c7c0e7c00187bed6ffa4b2e6a00642a296d080bc..592cf908fcf49d71dcfe896411361862b8180fe8 100644 (file)
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -21,22 +21,20 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Brion Vibber <brion@pobox.com>
  * @author    Evan Prodromou <evan@status.net>
  * @author    Robin Millette <robin@millette.info>
+ * @author    Siebrand Mazeland <s.mazeland@xs4all.nl>
  * @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
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apibareauth.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
- * We do not have a rate limit, but some clients check this method.
+ * We don't have a rate limit, but some clients check this method.
  * It always returns the same thing: 150 hits left.
  *
  * @category API
@@ -47,10 +45,8 @@ require_once INSTALLDIR . '/lib/apibareauth.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 ApiAccountRateLimitStatusAction extends ApiBareAuthAction
 {
-
     /**
      * Handle the request
      *
@@ -60,18 +56,17 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
      *
      * @return void
      */
-
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
-                _('API method not found!'),
+                // TRANS: Client error displayed when coming across a non-supported API method.
+                _('API method not found.'),
                 404,
                 $this->format
             );
-            return;
         }
 
         $reset   = new DateTime();
@@ -105,8 +100,20 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
              print json_encode($out);
          }
 
-         $this->endDocument($this->format);
+        $this->endDocument($this->format);
     }
 
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
 }
-