X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Furl_parser.php;h=53c18a24011fd6698164c48a4d9c8eb0879cf23f;hb=f1f3803aab9214d9d65a6e2ff9a5fbb4339be0ad;hp=30f95b3d179d058b1271ad24bc6071e36eb800db;hpb=5917742752bea11a547aeba6e4102dd3655b4800;p=squirrelmail.git

diff --git a/functions/url_parser.php b/functions/url_parser.php
index 30f95b3d..53c18a24 100644
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -10,46 +10,122 @@
       return $ret;
    }
 
-   function parseEmail ($body) {
-      global $PHPSESSID;
-      $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+(\.([a-z]|[0-9]|_|-)+)*", "<a href=\"../src/compose.php?PHPSESSID=$PHPSESSID&send_to=\\0\">\\0</a>", $body);
-      return $body;
-   }
-
-   function parseUrl ($body) {
-      #Possible ways a URL could finish.
-
-      $poss_ends=array(" ","\n","\r","<",".&nbsp","&nbsp");
-      $done=False;
-      while (!$done) {
-         #Look for when a URL starts
-         $where = strpos($body,"http:",$start);
-         if ($where) {
-            # Find the end of that URL
-            reset($poss_ends); $end=0; 
-            while (list($key, $val) = each($poss_ends)) {
-               $enda = strpos($body,$val,$where);
-               if ($end == 0) $end = $enda;
-               if ($enda < $end and $enda != 0) $end = $enda;
-            } 
-            #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); 
-               $body = replaceBlock($body,$url_str,$where,$end);
-               $start = strpos($body,"</a>",$where);
-            } else { 
-               $start = $where + 7; 
-            } 
-         } else {
-            $done=true;
+   function parseEmail (&$body) {
+      global $color;
+      $Size = strlen($body);
+      
+      // Having this defined in just one spot could help when changes need
+      // to be made to the pattern
+      // Make sure that the expression is evaluated case insensitively
+      // 
+      // Here's pretty sophisticated IP matching:
+      // $IPMatch = '(2[0-5][0-9]|1?[0-9]{1,2})';
+      // $IPMatch = '\[?' . $IPMatch . '(\.' . $IPMatch . '){3}\]?';
+      //
+      // Here's enough:
+      $IPMatch = '\[?[0-9]{1,3}(\.[0-9]{1,3}){3}\]?';
+      $Host = '(' . $IPMatch . '|[0-9a-z]([-.]?[0-9a-z])*\.[a-wyz][a-z](g|l|m|pa|t|u|v)?)';
+      $Expression = '[0-9a-z]([-_.]?[0-9a-z])*(%' . $Host . ')?@' . $Host;
+      
+      /*
+        This is here in case we ever decide to use highlighting of searched
+        text.  this does it for email addresses
+        
+      if ($what && ($where == "BODY" || $where == "TEXT")) {
+         eregi ($Expression, $body, $regs);
+         $oldaddr = $regs[0];
+         if ($oldaddr) {
+            $newaddr = eregi_replace ($what, "<b><font color=\"$color[2]\">$what</font></font></b>", $oldaddr);
+            $body = str_replace ($oldaddr, "<a href=\"../src/compose.php?send_to=$oldaddr\">$newaddr</a>", $body); 
          }
+      } else { 
+         $body = eregi_replace ($Expression, "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body);
       }
-
-      return $body;
+      */
+      
+      $body = eregi_replace ($Expression, "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body); 
+      
+      // If there are any changes, it'll just get bigger.
+      if ($Size != strlen($body))
+          return 1;
+      return 0;
    }
 
-?>
 
+   function parseUrl (&$body)
+   {
+      $url_tokens = array(
+         'http://',
+         'https://',
+         'ftp://',
+         'telnet:',  // Special case -- doesn't need the slashes
+         'gopher://',
+         'news://');
+
+      $poss_ends = array(' ', '\n', '\r', '<', '>', '.\r', '.\n', '.&nbsp;', 
+         '&nbsp;', ')', '(', '&quot;', '&lt;', '&gt;', '.<', ']', '[', '{', 
+         '}', "\240");
+
+      $start = 0;
+      $target_pos = strlen($body);
+      
+      while ($start != $target_pos)
+      {
+        $target_token = '';
+        
+        // Find the first token to replace
+        foreach ($url_tokens as $the_token)
+        {
+          $pos = strpos(strtolower($body), $the_token, $start);
+          if (is_int($pos) && $pos < $target_pos)
+          {
+            $target_pos = $pos;
+            $target_token = $the_token;
+          }
+        }
+        
+        // Look for email addresses between $start and $target_pos
+        $check_str = substr($body, $start, $target_pos);
+       
+        if (parseEmail($check_str))
+        {
+          $body = replaceBlock($body, $check_str, $start, $target_pos);
+          $target_pos = strlen($check_str) + $start;
+        }
+
+        // If there was a token to replace, replace it
+        if ($target_token != '')
+        {
+          // Find the end of the URL
+          $end=strlen($body); 
+          foreach ($poss_ends as $key => $val)
+          {
+            $enda = strpos($body,$val,$target_pos);
+            if (is_int($enda) && $enda < $end) 
+              $end = $enda;
+          }
+          
+          // Extract URL
+          $url = substr($body, $target_pos, $end-$target_pos);
+          
+          // Replace URL with HyperLinked Url, requires 1 char in link
+          if ($url != '' && $url != $target_token) 
+          {
+            $url_str = "<a href=\"$url\" target=\"_blank\">$url</a>";
+            $body = replaceBlock($body,$url_str,$target_pos,$end);
+            $target_pos += strlen($url_str);
+          } 
+          else 
+          { 
+             // Not quite a valid link, skip ahead to next chance
+             $target_pos += strlen($target_token);
+          }
+        }
+        
+        // Move forward
+        $start = $target_pos;
+        $target_pos = strlen($body);
+      }
+   }
+   
+?>