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 a34631437f5a71314ff9b969243229bb4639be10..9d44543acb3ee0b2b869c3845ffec05985c69e5f 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -35,7 +35,7 @@
       #Possible ways a URL could finish.
 
       $poss_ends=array(" ", "\n", "\r", "<", ">", ".\r", ".\n", ".&nbsp;", "&nbsp;", ")", "(", 
-                       "&quot;", "&lt;", "&gt;", ".<");
+                       "&quot;", "&lt;", "&gt;", ".<", "]", "[", "{", "}", "--");
       $done=False;
       while (!$done) {
          #Look for when a URL starts
@@ -45,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)) {