projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oldway=false : Fix forged LSUB response triggered by new regexp, and internationalize...
[squirrelmail.git]
/
functions
/
url_parser.php
diff --git
a/functions/url_parser.php
b/functions/url_parser.php
index 0d9fc15328ccd388e6e0b5d67a8500853efb62cd..20b1fdae39e54b761009d62e702588d4969daf8d 100644
(file)
--- a/
functions/url_parser.php
+++ b/
functions/url_parser.php
@@
-35,7
+35,7
@@
$Email_RegExp_Match = '[0-9a-z]([-_.+]?[0-9a-z])*(%' . $Host_RegExp_Match .
')?@' . $Host_RegExp_Match;
function parseEmail (&$body) {
')?@' . $Host_RegExp_Match;
function parseEmail (&$body) {
- global $color, $Email_RegExp_Match
, $compose_new_win
;
+ global $color, $Email_RegExp_Match;
$sbody = $body;
$addresses = array();
$sbody = $body;
$addresses = array();
@@
-47,12
+47,7
@@
function parseEmail (&$body) {
}
/* Replace each email address with a compose URL */
foreach ($addresses as $email) {
}
/* 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>';
+ $comp_uri = makeComposeLink('src/compose.php?send_to='.urlencode($email), $email);
$body = str_replace($email, $comp_uri, $body);
}
/* Return number of unique addresses found */
$body = str_replace($email, $comp_uri, $body);
}
/* Return number of unique addresses found */