Add some filters to clean URLs

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

diff --git a/index.php b/index.php
index 9d4ce15619b4562dc85004062c055151701d392c..d7140409520cf846d36ded93bbd58fdd2133f4f5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -184,8 +184,8 @@ function checkUpdate()
     if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME'])<time()-($GLOBALS['config']['UPDATECHECK_INTERVAL'])))
     {
         $version=shaarli_version;
-        list($httpstatus,$headers,$data) = getHTTP('https://raw.githubusercontent.com/shaarli/Shaarli/master/shaarli_version.txt',2);
-        if (strpos($httpstatus,'200 OK')!==false) $version=$data;
+        list($httpstatus,$headers,$data) = getHTTP('https://raw.githubusercontent.com/shaarli/Shaarli/master/shaarli_version.php',2);
+        if (strpos($httpstatus,'200 OK')!==false) $version=str_replace(' */ ?>','',str_replace('<?php /* ','',$data));
         // If failed, never mind. We don't want to bother the user with that.
         file_put_contents($GLOBALS['config']['UPDATECHECK_FILENAME'],$version); // touch file date
     }
@@ -1646,6 +1646,11 @@ function renderPage()
         $i=strpos($url,'&utm_source='); if ($i!==false) $url=substr($url,0,$i);
         $i=strpos($url,'?utm_source='); if ($i!==false) $url=substr($url,0,$i);
         $i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i);
+        $i=strpos($url,'?fb_'); if ($i!==false) $url=substr($url,0,$i);
+       $i=strpos($url,'?__scoop'); if ($i!==false) $url=substr($url,0,$i);
+       $i=strpos($url,'#tk.rss_all?'); if ($i!==false) $url=substr($url,0,$i);
+       $i=strpos($url,'?utm_campaign='); if ($i!==false) $url=substr($url,0,$i);
+       $i=strpos($url,'?utm_medium='); if ($i!==false) $url=substr($url,0,$i); 
 
         $link_is_new = false;
         $link = $LINKSDB->getLinkFromUrl($url); // Check if URL is not already in database (in this case, we will edit the existing link)