X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Furl_parser.php;h=0d9fc15328ccd388e6e0b5d67a8500853efb62cd;hb=44009644939a9db0907e98926fe8a2cdb7865539;hp=f084a4304a91bfd6a3d2f70124c087c3bfa0a4e0;hpb=9c3e6cd4518d9e0d072a146fd6d19acd4daac243;p=squirrelmail.git
diff --git a/functions/url_parser.php b/functions/url_parser.php
index f084a430..0d9fc153 100644
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -3,7 +3,7 @@
/**
* url_parser.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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
@@ -21,7 +21,7 @@ function replaceBlock (&$in, $replace, $start, $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}\]?';
@@ -29,46 +29,34 @@ function replaceBlock (&$in, $replace, $start, $end) {
/* 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 .
+$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 .
+$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;
- $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, "$what", $oldaddr);
- * $body = str_replace ($oldaddr, "$newaddr", $body);
- * }
- * } else {
- * $body = eregi_replace ($Email_RegExp_Match, "\\0", $body);
- * }
- */
-
- if( eregi($Email_RegExp_Match, $body, $regs) ) {
- if ($compose_new_win == '1') {
- $body = str_replace($regs[0], ''.$regs[0].'', $body);
- }
- else {
- $body = str_replace($regs[0], ''.$regs[0].'', $body);
- }
- }
-
- /* If there are any changes, it'll just get bigger. */
- if ($Size != strlen($body)) {
- return 1;
+ $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);
}
- return 0;
+ /* 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 = ''.$email.'';
+ $body = str_replace($email, $comp_uri, $body);
+ }
+ /* Return number of unique addresses found */
+ return count($addresses);
}
@@ -92,43 +80,45 @@ $url_parser_poss_ends = array(' ', "\n", "\r", '<', '>', ".\r", ".\n",
function parseUrl (&$body) {
global $url_parser_poss_ends, $url_parser_url_tokens;;
- $start = 0;
- $target_pos = strlen($body);
-
- while ($start != $target_pos) {
+ $start = 0;
+ $blength = strlen($body);
+
+ while ($start != $blength) {
$target_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 < $target_pos) {
- $target_pos = $pos;
+ 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);
-
+ $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);
+ $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 );
@@ -140,16 +130,16 @@ function parseUrl (&$body) {
$url_str = "$url";
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);
+ }
+ 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);
+ $start = $target_pos;
+ $blength = strlen($body);
}
}
?>