Fix issue 366, Problem when shaaring a link in Reader View of Firefox.

[github/shaarli/Shaarli.git] / application / Url.php

diff --git a/application/Url.php b/application/Url.php
index d80c9c582f32e5e8b8053b291d354a112e21b6c0..e7c3a4cc4ae50291bd9e1cccf3dc55bd47899940 100644 (file)
--- a/application/Url.php
+++ b/application/Url.php
@@ -118,13 +118,26 @@ class Url
      */
     public function __construct($url)
     {
-        $this->parts = parse_url($url);
+        $this->parts = parse_url(trim($url));
 
         if (!empty($url) && empty($this->parts['scheme'])) {
             $this->parts['scheme'] = 'http';
         }
     }
 
+
+    private function removeFirefoxAboutReader($input){
+      $output_array = [];
+      preg_match("%^about://reader\?url=(.*)%", $input, $output_array);
+      if(!empty($output_array)){
+        $extractedUrl = preg_replace("%^about://reader\?url=(.*)%", "$1", $input);
+        $url = urldecode($extractedUrl);
+      }else{
+        $url = $input;
+      }
+      return $url;
+    }
+    
     /**
      * Returns a string representation of this URL
      */
@@ -187,7 +200,8 @@ class Url
     {
         $this->cleanupQuery();
         $this->cleanupFragment();
-        return $this->toString();
+        $url = $this->toString();
+        return $this->removeFirefoxAboutReader($url);
     }
 
     /**
@@ -201,4 +215,13 @@ class Url
         }
         return $this->parts['scheme'];
     }
+
+    /**
+     * Test if the Url is an HTTP one.
+     *
+     * @return true is HTTP, false otherwise.
+     */
+    public function isHttp() {
+        return strpos(strtolower($this->parts['scheme']), 'http') !== false;
+    }
 }