Improve getSelfRoutedURLNoQuery method

Author: pitbulk

src/Saml2/Utils.php

@@ -622,7 +622,7 @@ public static function getSelfRoutedURLNoQuery()
         if (!empty($_SERVER['REQUEST_URI'])) {
             $route = $_SERVER['REQUEST_URI'];
             if (!empty($_SERVER['QUERY_STRING'])) {
-                $route = str_replace($_SERVER['QUERY_STRING'], '', $route);
+                $route = self::str_lreplace($_SERVER['QUERY_STRING'], '', $route);
                 if (substr($route, -1) == '?') {
                     $route = substr($route, 0, -1);
                 }
@@ -635,9 +635,26 @@ public static function getSelfRoutedURLNoQuery()
         }
 
         $selfRoutedURLNoQuery = $selfURLhost . $route;
+
+        $pos = strpos($selfRoutedURLNoQuery, "?");
+        if ($pos !== false) {
+            $selfRoutedURLNoQuery = substr($selfRoutedURLNoQuery, 0, $pos-1);
+        }
+
         return $selfRoutedURLNoQuery;
     }
 
+    public static function str_lreplace($search, $replace, $subject)
+    {
+        $pos = strrpos($subject, $search);
+
+        if ($pos !== false) {
+            $subject = substr_replace($subject, $replace, $pos, strlen($search));
+        }
+
+        return $subject;
+    }
+
     /**
      * Returns the URL of the current host + current view + query.
      *