Removed, now a plugin, no idea if this will be included with the source tree.

[squirrelmail.git] / functions / url_parser.php

diff --git a/functions/url_parser.php b/functions/url_parser.php
index 64e308a5dbc8fa33f288081d6bcf430b9b152f3c..9d44543acb3ee0b2b869c3845ffec05985c69e5f 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -34,7 +34,8 @@
    function parseUrl ($body) {
       #Possible ways a URL could finish.
 
-      $poss_ends=array(" ", "\n", "\r", "<", ">", ".\r", ".\n", ".&nbsp", "&nbsp", ")", "(","&quot");
+      $poss_ends=array(" ", "\n", "\r", "<", ">", ".\r", ".\n", ".&nbsp;", "&nbsp;", ")", "(", 
+                       "&quot;", "&lt;", "&gt;", ".<", "]", "[", "{", "}", "--");
       $done=False;
       while (!$done) {
          #Look for when a URL starts
@@ -44,11 +45,12 @@
                          "ftp://",
                          "telnet://");
          for($i = 0; $i < sizeof($url_tokens); $i++) {
-           if($where = strpos(strtolower($body), $url_tokens[$i], $start))
+           if($where = strpos(strtolower("^^".$body), $url_tokens[$i], $start))
              break;
          }
          //$where = strpos(strtolower($body),"http://",$start);
          if ($where) {
+            $where = $where - 2;  // because we added the ^^ at the begining
             # Find the end of that URL
             reset($poss_ends); $end=0; 
             while (list($key, $val) = each($poss_ends)) {
@@ -56,12 +58,14 @@
                if ($end == 0) $end = $enda;
                if ($enda < $end and $enda != 0) $end = $enda;
             } 
+            if (!$end) $end = strlen($body);
             #Extract URL
             $url = substr($body,$where,$end-$where);
             #Replace URL with HyperLinked Url
             if ($url != "") {
                $url_str = "<a href=\"$url\" target=\"_blank\">$url</a>";
                #    $body = str_replace($url,$url_str,$body); 
+               # echo "$where, $end<br>";
                $body = replaceBlock($body,$url_str,$where,$end);
                $start = strpos($body,"</a>",$where);
             } else {