Merge pull request #141 from nodiscc/cleanurl-filters

[github/shaarli/Shaarli.git] / index.php

diff --git a/index.php b/index.php
index cc3d7360227a04fae5a113dde56f9003f352f385..a8326a2b4422baad7ee32ac3b266e3eb3328614c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1642,11 +1642,12 @@ function renderPage()
     {
         $url=$_GET['post'];
 
+
         // We remove the annoying parameters added by FeedBurner, GoogleFeedProxy, Facebook...
-        $annoyingpatterns = array('&utm_source=', '?utm_source=', '#xtor=RSS-', '?fb_', '?__scoop', '#tk.rss_all?', '?utm_campaign=', '?utm_medium=');
+        $annoyingpatterns = array('/[\?&]utm_source=[^&]*/', '/[\?&]utm_campaign=[^&]*/', '/[\?&]utm_medium=[^&]*/', '/#xtor=RSS-[^&]*/', '/[\?&]fb_[^&]*/', '/[\?&]__scoop[^&]*/', '/#tk\.rss_all\?/', '/[\?&]action_ref_map=[^&]*/', '/[\?&]action_type_map=[^&]*/', '/[\?&]action_object_map=[^&]*/');
         foreach($annoyingpatterns as $pattern)
         {
-            $i=strpos($url,$pattern); if ($i!==false) $url=substr($url,0,$i);
+            $url = preg_replace($pattern, "", $url);
         }
 
         $link_is_new = false;
@@ -2127,11 +2128,8 @@ function lazyThumbnail($url,$href=false)
 
     $html='<a href="'.htmlspecialchars($t['href']).'">';
 
-    // Lazy image (only loaded by JavaScript when in the viewport).
-    if (!empty($GLOBALS['disablejquery'])) // (except if jQuery is disabled)
-        $html.='<img class="lazyimage" src="'.htmlspecialchars($t['src']).'"';
-    else
-        $html.='<img class="lazyimage" src="#" data-original="'.htmlspecialchars($t['src']).'"';
+    // Lazy image
+    $html.='<img class="b-lazy" src="#" data-src="'.htmlspecialchars($t['src']).'"';
 
     if (!empty($t['width']))  $html.=' width="'.htmlspecialchars($t['width']).'"';
     if (!empty($t['height'])) $html.=' height="'.htmlspecialchars($t['height']).'"';