X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Furl_parser.php;h=a686dbae1c7aedafb7c2fe7efee9db0f2aa86a4e;hb=a9e67ec391e80d1df7fe52c21d7f106ddc3c5583;hp=c9ee48627853ec8ef5a68a920e200da3f6ff45db;hpb=7350889b45590aee831ba1150ee94efb95b03992;p=squirrelmail.git

diff --git a/functions/url_parser.php b/functions/url_parser.php
index c9ee4862..a686dbae 100644
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -1,154 +1,145 @@
 <?php
 
-   /**
-    *  url_parser.php
-    *
-    *  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    *  Licensed under the GNU GPL. For full terms see the file COPYING.
-    *
-    *  This code provides various string manipulation functions that are
-    *  used by the rest of the Squirrelmail code.
-    *
-    *  $Id$
-    */
-
-   function replaceBlock (&$in, $replace, $start, $end) {
-      $begin = substr($in,0,$start);
-      $end   = substr($in,$end,strlen($in)-$end);
-      $in    = $begin.$replace.$end;
-   }
-
-   // 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:
-   global $IP_RegExp_Match, $Host_RegExp_Match, $Email_RegExp_Match;
-   $IP_RegExp_Match = '\\[?[0-9]{1,3}(\\.[0-9]{1,3}){3}\\]?';
-   $Host_RegExp_Match = '(' . $IP_RegExp_Match . 
-       '|[0-9a-z]([-.]?[0-9a-z])*\\.[a-z][a-z]+)';
-   $Email_RegExp_Match = '[0-9a-z]([-_.]?[0-9a-z])*(%' . $Host_RegExp_Match . 
-       ')?@' . $Host_RegExp_Match;
-      
-   function parseEmail (&$body) {
-      global $color, $Email_RegExp_Match;
-      $Size = strlen($body);
-      
-      /*
-        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 ($Email_RegExp_Match, $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 ($Email_RegExp_Match, "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body);
-      }
-      */
-      
-      $body = eregi_replace ($Email_RegExp_Match, "<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;
-   }
-
-
-   // We don't want to re-initialize this stuff for every line.  Save work
-   // and just do it once here.
-   global $url_parser_url_tokens;
-   $url_parser_url_tokens = array(
-       'http://',
-       'https://',
-       'ftp://',
-       'telnet:',  // Special case -- doesn't need the slashes
-       'gopher://',
-       'news://');
-
-   global $url_parser_poss_ends;
-   $url_parser_poss_ends = array(' ', "\n", "\r", '<', '>', ".\r", ".\n", 
-       '.&nbsp;', '&nbsp;', ')', '(', '&quot;', '&lt;', '&gt;', '.<', 
-       ']', '[', '{', '}', "\240", ', ', '. ', ",\n", ",\r");
-
-
-   function parseUrl (&$body)
-   {
-      global $url_parser_poss_ends, $url_parser_url_tokens;;
-      $start = 0;
-      $target_pos = strlen($body);
-      
-      while ($start != $target_pos)
-      {
+/**
+ * url_parser.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * This code provides various string manipulation functions that are
+ * used by the rest of the Squirrelmail code.
+ *
+ * $Id$
+ */
+
+function replaceBlock (&$in, $replace, $start, $end) {
+    $begin = substr($in,0,$start);
+    $end   = substr($in,$end,strlen($in)-$end);
+    $in    = $begin.$replace.$end;
+}
+
+/* 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: */
+global $IP_RegExp_Match, $Host_RegExp_Match, $Email_RegExp_Match;
+$IP_RegExp_Match = '\\[?[0-9]{1,3}(\\.[0-9]{1,3}){3}\\]?';
+$Host_RegExp_Match = '(' . $IP_RegExp_Match .
+    '|[0-9a-z]([-.]?[0-9a-z])*\\.[a-z][a-z]+)';
+$Email_RegExp_Match = '[0-9a-z]([-_.+]?[0-9a-z])*(%' . $Host_RegExp_Match .
+    ')?@' . $Host_RegExp_Match;
+
+function parseEmail (&$body) {
+    global $color, $Email_RegExp_Match, $compose_new_win;
+    $sbody     = $body;
+    $addresses = array();
+
+    /* Find all the email addresses in the body */
+    while(eregi($Email_RegExp_Match, $sbody, $regs)) {
+        $addresses[$regs[0]] = $regs[0];
+        $start = strpos($sbody, $regs[0]) + strlen($regs[0]);
+        $sbody = substr($sbody, $start);
+    }
+    /* Replace each email address with a compose URL */
+    foreach ($addresses as $email) {
+        $comp_uri = '../src/compose.php?send_to='.urlencode($email);
+        if ($compose_new_win == '1') {
+            $comp_uri  = 'javascript:void(0)" onClick="comp_in_new('
+                       . "'$comp_uri'" . ')';
+        }
+        $comp_uri = '<a href="'.$comp_uri.'">'.$email.'</a>';
+        $body = str_replace($email, $comp_uri, $body);
+    }
+    /* Return number of unique addresses found */
+    return count($addresses);
+}
+
+
+/* We don't want to re-initialize this stuff for every line.  Save work
+ * and just do it once here.
+ */
+global $url_parser_url_tokens;
+$url_parser_url_tokens = array(
+    'http://',
+    'https://',
+    'ftp://',
+    'telnet:',  // Special case -- doesn't need the slashes
+    'gopher://',
+    'news://');
+
+global $url_parser_poss_ends;
+$url_parser_poss_ends = array(' ', "\n", "\r", '<', '>', ".\r", ".\n", 
+    '.&nbsp;', '&nbsp;', ')', '(', '&quot;', '&lt;', '&gt;', '.<', 
+    ']', '[', '{', '}', "\240", ', ', '. ', ",\n", ",\r");
+
+
+function parseUrl (&$body) {
+    global $url_parser_poss_ends, $url_parser_url_tokens;;
+    $start      = 0;
+    $blength    = strlen($body);
+
+    while ($start != $blength) {
         $target_token = '';
-        
-        // Find the first token to replace
-        foreach ($url_parser_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;
-          }
+        $target_pos = $blength;
+
+        /* Find the first token to replace */
+        foreach ($url_parser_url_tokens as $the_token) {
+            $pos = strpos(strtolower($body), $the_token, $start);
+            if (is_int($pos) && $pos < $blength) {
+                $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))
-        {
-          replaceBlock($body, $check_str, $start, $target_pos);
-          $target_pos = strlen($check_str) + $start;
+
+        /* Look for email addresses between $start and $target_pos */
+        $check_str = substr($body, $start, $target_pos-$start);
+
+        if (parseEmail($check_str)) {
+            replaceBlock($body, $check_str, $start, $target_pos);
+            $blength    = strlen($body);
+            $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 ($url_parser_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);
-          
-          // Needed since lines are not passed with \n or \r
-          while ( ereg("[,\.]$", $url) ) {
-            $url = substr( $url, 0, -1 );
-            $end--;
-          }
-
-          // Replace URL with HyperLinked Url, requires 1 char in link
-          if ($url != '' && $url != $target_token) 
-          {
-            $url_str = "<a href=\"$url\" target=\"_blank\">$url</a>";
-            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);
-          }
+        /* If there was a token to replace, replace it */
+        if ($target_token != '') {
+            /* Find the end of the URL */
+            $end = $blength;
+            foreach ($url_parser_poss_ends as $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);
+
+            /* Needed since lines are not passed with \n or \r */
+            while ( ereg("[,\.]$", $url) ) {
+                $url = substr( $url, 0, -1 );
+                $end--;
+            }
+
+            /* Replace URL with HyperLinked Url, requires 1 char in link */
+            if ($url != '' && $url != $target_token) {
+                $url_str = "<a href=\"$url\" target=\"_blank\">$url</a>";
+                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);
-      }
-   }
-   
+
+        /* Move forward */
+        $start   = $target_pos;
+        $blength = strlen($body);
+    }
+} 
 ?>