Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/actions/apicheckhub.php b/actions/apicheckhub.php
index 2650d367ae31eb9d4d23514605968fb02ba8a414..19cc4d19f63041ec46480ef9335054357ba0761e 100644 (file)
--- a/actions/apicheckhub.php
+++ b/actions/apicheckhub.php
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  API
- * @package   GNUSocial
+ * @package   GNUsocial
  * @author    Hannes Mannerheim <h@nnesmannerhe.im>
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://www.gnu.org/software/social/
@@ -34,6 +34,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ApiCheckHubAction extends ApiAuthAction
 {
+    protected $url = null;
+
     /**
      * Take arguments for running
      *
@@ -41,20 +43,22 @@ class ApiCheckHubAction extends ApiAuthAction
      *
      * @return boolean success flag
      */
-    protected function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
+        if ($this->format !== 'json') {
+            $this->clientError('This method currently only serves JSON.', 415);
+        }
+
         $this->url = urldecode($args['url']);
         
         if (empty($this->url)) {
-            $this->clientError(_('No URL.'), 403, 'json');
-            return;            
+            $this->clientError(_('No URL.'), 403);
         }
 
         if (!common_valid_http_url($this->url)) {
-            $this->clientError(_('Invalid URL.'), 403, 'json');
-            return;
+            $this->clientError(_('Invalid URL.'), 403);
         }
         
         return true;
@@ -79,11 +83,9 @@ class ApiCheckHubAction extends ApiAuthAction
                 $huburi = $discover->getHubLink();                
             }
         } catch (FeedSubNoFeedException $e) {
-            $this->clientError(_('No feed found'), 403, 'json');
-            return;
+            $this->clientError(_('No feed found'), 403);
         } catch (FeedSubBadResponseException $e) {
-            $this->clientError(_('No hub found'), 403, 'json');
-            return;
+            $this->clientError(_('No hub found'), 403);
         }
                
                $hub_status = array();
@@ -106,7 +108,7 @@ class ApiCheckHubAction extends ApiAuthAction
      * @return boolean is read only action?
      */
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }