0ct0pu5/squirrelmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

url_parser.php didn't handle multiple addresses on the same line. This

Browse source 
fixes that.  Also some readability changes.
This commit is contained in:
indiri69 2002-08-08 22:10:41 +00:00
parent 271ff2d72a
commit 2247e2d006
1 changed files with 41 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
functions/url_parser.php
View file

@ -36,40 +36,27 @@ $Email_RegExp_Match = '[0-9a-z]([-_.+]?[0-9a-z])*(%' . $Host_RegExp_Match .
function parseEmail (&$body) { function parseEmail (&$body) {
global $color, $Email_RegExp_Match, $compose_new_win; global $color, $Email_RegExp_Match, $compose_new_win;
$Size = strlen($body); $sbody = $body;
$addresses = array();
/* /* Find all the email addresses in the body */
* This is here in case we ever decide to use highlighting of searched while(eregi($Email_RegExp_Match, $sbody, $regs)) {
* text. this does it for email addresses $addresses[$regs[0]] = $regs[0];
* $start = strpos($sbody, $regs[0]) + strlen($regs[0]);
* if ($what && ($where == "BODY" || $where == "TEXT")) { $sbody = substr($sbody, $start);
* eregi ($Email_RegExp_Match, $body, $regs); }
* $oldaddr = $regs[0]; /* Replace each email address with a compose URL */
* if ($oldaddr) { foreach ($addresses as $email) {
* $newaddr = eregi_replace ($what, "<b><font color=\"$color[2]\">$what</font></font></b>", $oldaddr); $comp_uri = '../src/compose.php?send_to='.urlencode($email);
* $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);
* }
*/
if( eregi($Email_RegExp_Match, $body, $regs) ) {
if ($compose_new_win == '1') { if ($compose_new_win == '1') {
$comp_uri = '../src/compose.php?send_to='.urlencode($regs[0]); $comp_uri = 'javascript:void(0)" onClick="comp_in_new('
$body = str_replace($regs[0], '<a href="javascript:void(0)" onClick="comp_in_new('."'$comp_uri'".')">'.$regs[0].'</a>', $body); . "'$comp_uri'" . ')';
} }
else { $comp_uri = '<a href="'.$comp_uri.'">'.$email.'</a>';
$body = str_replace($regs[0], '<a href="../src/compose.php?send_to='. $body = str_replace($email, $comp_uri, $body);
urlencode($regs[0]).'">'.$regs[0].'</a>', $body);
} }
} /* Return number of unique addresses found */
return count($addresses);
/* If there are any changes, it'll just get bigger. */
if ($Size != strlen($body)) {
return 1;
}
return 0;
} }
@ -94,34 +81,36 @@ $url_parser_poss_ends = array(' ', "\n", "\r", '<', '>', ".\r", ".\n",
function parseUrl (&$body) { function parseUrl (&$body) {
global $url_parser_poss_ends, $url_parser_url_tokens;; global $url_parser_poss_ends, $url_parser_url_tokens;;
$start = 0; $start = 0;
$target_pos = strlen($body); $blength = strlen($body);
$target_pos = $blength;
while ($start != $target_pos) { while ($start != $blength) {
$target_token = ''; $target_token = '';
/* Find the first token to replace */ /* Find the first token to replace */
foreach ($url_parser_url_tokens as $the_token) { foreach ($url_parser_url_tokens as $the_token) {
$pos = strpos(strtolower($body), $the_token, $start); $pos = strpos(strtolower($body), $the_token, $start);
if (is_int($pos) && $pos < $target_pos) { if (is_int($pos) && $pos < $blength) {
$target_pos = $pos; $target_pos = $pos;
$target_token = $the_token; $target_token = $the_token;
} }
} }
/* Look for email addresses between $start and $target_pos */ /* 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)) { if (parseEmail($check_str)) {
replaceBlock($body, $check_str, $start, $target_pos); replaceBlock($body, $check_str, $start, $target_pos);
$blength = strlen($body);
$target_pos = strlen($check_str) + $start; $target_pos = strlen($check_str) + $start;
} }
/* If there was a token to replace, replace it */ /* If there was a token to replace, replace it */
if ($target_token != '') { if ($target_token != '') {
/* Find the end of the URL */ /* Find the end of the URL */
$end=strlen($body); $end = $blength;
foreach ($url_parser_poss_ends as $key => $val) { foreach ($url_parser_poss_ends as $val) {
$enda = strpos($body,$val,$target_pos); $enda = strpos($body, $val, $target_pos);
if (is_int($enda) && $enda < $end) { if (is_int($enda) && $enda < $end) {
$end = $enda; $end = $enda;
} }
@ -150,7 +139,7 @@ function parseUrl (&$body) {
/* Move forward */ /* Move forward */
$start = $target_pos; $start = $target_pos;
$target_pos = strlen($body); $blength = strlen($body);
} }
} }
?> ?>