added "cc" and "body" for searching

[squirrelmail.git] / functions / url_parser.php

diff --git a/functions/url_parser.php b/functions/url_parser.php
index 676c9f1a3fea8e028fffc0d03e4cf57401898f01..cc0accca1f8d0769d2fa6e2f5a95697e1d661004 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -18,11 +18,20 @@
    function parseUrl ($body) {
       #Possible ways a URL could finish.
 
-      $poss_ends=array(" ", "\n", "\r", "<", ">", ".\r", ".\n", ".&nbsp", "&nbsp", ")", "(");
+      $poss_ends=array(" ", "\n", "\r", "<", ">", ".\r", ".\n", ".&nbsp", "&nbsp", ")", "(","&quot");
       $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;