X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FUrl.php;fp=application%2FUrl.php;h=af43b457961729f3a5c2abc82a407b4a402531ec;hb=ef591e7ee21435da9314c5f7f6ea983c6f423898;hp=02a4395d01c8fd75d46921439ba44ef42249da8f;hpb=0a813cfd7cdf3c81faba8568bf6e2e667aae6f13;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/Url.php b/application/Url.php
index 02a4395d..af43b457 100755
--- a/application/Url.php
+++ b/application/Url.php
@@ -25,6 +25,32 @@ 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();
+}
+
 /**
  * URL representation and cleanup utilities
  *
@@ -90,7 +116,7 @@ class Url
     /**
      * Returns a string representation of this URL
      */
-    public function __toString()
+    public function toString()
     {
         return unparse_url($this->parts);
     }
@@ -149,7 +175,7 @@ class Url
     {
         $this->cleanupQuery();
         $this->cleanupFragment();
-        return $this->__toString();
+        return $this->toString();
     }
 
     /**