Added th patch from Tom Duffey, added checking for ftp, telnet, https will lookinto...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@535 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/url_parser.php b/functions/url_parser.php
index 676c9f1a3fea8e028fffc0d03e4cf57401898f01..5b285391f8cf93404570d6e694bc4431da8ccf7a 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -22,7 +22,16 @@
       $done=False;
       while (!$done) {
          #Look for when a URL starts
-         $where = strpos(strtolower($body),"http://",$start);
+         $url_tokens = array(
+                         "http://",
+                         "https://",
+                         "ftp://",
+                         "telnet://");
+         for($i = 0; $i < sizeof($url_tokens); $i++) {
+           if($where = strpos(strtolower($body), $url_tokens[$i], $start))
+             break;
+         }
+         //$where = strpos(strtolower($body),"http://",$start);
          if ($where) {
             # Find the end of that URL
             reset($poss_ends); $end=0;