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
old mode 100755 (executable)
new mode 100644 (file)
index 02a4395..e7c3a4c
--- a/application/Url.php
+++ b/application/Url.php
@@ -25,6 +25,44 @@ function unparse_url($parsedUrl)
     return "$scheme$user$pass$host$port$path$query$fragment";
 }
 
+/**
+ * Removes undesired query parameters and fragments
+ *
+ * @param string url Url to be cleaned
+ *
+ * @return string the string representation of this URL after cleanup
+ */
+function cleanup_url($url)
+{
+  $obj_url = new Url($url);
+  return $obj_url->cleanup();
+}
+
+/**
+ * Get URL scheme.
+ *
+ * @param string url Url for which the scheme is requested
+ *
+ * @return mixed the URL scheme or false if none is provided.
+ */
+function get_url_scheme($url)
+{
+  $obj_url = new Url($url);
+  return $obj_url->getScheme();
+}
+
+/**
+ * Adds a trailing slash at the end of URL if necessary.
+ *
+ * @param string $url URL to check/edit.
+ *
+ * @return string $url URL with a end trailing slash.
+ */
+function add_trailing_slash($url)
+{
+    return $url . (!endsWith($url, '/') ? '/' : '');
+}
+
 /**
  * URL representation and cleanup utilities
  *
@@ -80,17 +118,30 @@ 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
      */
-    public function __toString()
+    public function toString()
     {
         return unparse_url($this->parts);
     }
@@ -149,7 +200,8 @@ class Url
     {
         $this->cleanupQuery();
         $this->cleanupFragment();
-        return $this->__toString();
+        $url = $this->toString();
+        return $this->removeFirefoxAboutReader($url);
     }
 
     /**
@@ -163,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;
+    }
 }