Let's not limit qvitter stuff to 'json' requests

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

diff --git a/actions/apicheckhub.php b/actions/apicheckhub.php
index d59506b667b415008b715a7a64166b5c45b5b44e..ed7f39baec45785490e175634dd0573a50dfaf32 100644 (file)
--- a/actions/apicheckhub.php
+++ b/actions/apicheckhub.php
@@ -34,6 +34,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ApiCheckHubAction extends ApiAuthAction
 {
+    protected $url = null;
+
     /**
      * Take arguments for running
      *
@@ -41,27 +43,24 @@ class ApiCheckHubAction extends ApiAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    protected function prepare($args)
     {
         parent::prepare($args);
 
-               $this->url = urldecode($args['url']);
-               
-               if (!$this->url) {
-            $this->clientError(_('No URL.'), 403, 'json');
-            return;                    
-               }
+        if ($this->format !== 'json') {
+            $this->clientError('This method currently only serves JSON.', 415);
+        }
 
-               if (!Validate::uri(
-                       $this->url, array(
-                           'allowed_schemes' =>
-                           array('http', 'https')
-                       )
-                   )) {
-            $this->clientError(_('Invalid URL.'), 403, 'json');
-            return;
-                       }
-               
+        $this->url = urldecode($args['url']);
+        
+        if (empty($this->url)) {
+            $this->clientError(_('No URL.'), 403);
+        }
+
+        if (!common_valid_http_url($this->url)) {
+            $this->clientError(_('Invalid URL.'), 403);
+        }
+        
         return true;
     }
 
@@ -72,23 +71,22 @@ class ApiCheckHubAction extends ApiAuthAction
      *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
+        parent::handle();
 
-               $discover = new FeedDiscovery();
+        $discover = new FeedDiscovery();
 
-           try {
-                       $feeduri = $discover->discoverFromURL($this->url);
-                       if($feeduri) {
-                       $huburi = $discover->getHubLink();                              
-                               }
-           } catch (FeedSubNoFeedException $e) {
-               $this->clientError(_('No feed found'), 403, 'json');
-               return;
-           } catch (FeedSubBadResponseException $e) {
-               $this->clientError(_('No hub found'), 403, 'json');
-               return;
-           }
+        try {
+            $feeduri = $discover->discoverFromURL($this->url);
+            if($feeduri) {
+                $huburi = $discover->getHubLink();                
+            }
+        } catch (FeedSubNoFeedException $e) {
+            $this->clientError(_('No feed found'), 403);
+        } catch (FeedSubBadResponseException $e) {
+            $this->clientError(_('No hub found'), 403);
+        }
                
                $hub_status = array();
                if ($huburi) {