X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Furl_parser.php;h=ba037388285cd93b3296c91039818ef9488105d3;hb=623662614b34b6f05a5ba6330bc5a624c8e9b731;hp=de49b1e8cded733571d0a1370d32d681c741d934;hpb=23aef3271babd4f54f379953b7111ec76e10f9fd;p=squirrelmail.git
diff --git a/functions/url_parser.php b/functions/url_parser.php
index de49b1e8..ba037388 100644
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -3,15 +3,19 @@
/**
* url_parser.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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$
+ * @package squirrelmail
*/
+/**
+ * Undocumented - complain, then patch.
+ */
function replaceBlock (&$in, $replace, $start, $end) {
$begin = substr($in,0,$start);
$end = substr($in,$end,strlen($in)-$end);
@@ -34,42 +38,30 @@ $Host_RegExp_Match = '(' . $IP_RegExp_Match .
$Email_RegExp_Match = '[0-9a-z]([-_.+]?[0-9a-z])*(%' . $Host_RegExp_Match .
')?@' . $Host_RegExp_Match;
+/**
+ * Parses a body and converts all found email addresses to clickable links.
+ *
+ * @param string body the body to process, by ref
+ * @return int the number of unique addresses found
+ */
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') {
- $comp_uri = '../src/compose.php?send_to='.urlencode($regs[0]);
- $body = str_replace($regs[0], ''.$regs[0].'', $body);
- }
- else {
- $body = str_replace($regs[0], ''.$regs[0].'', $body);
- }
- }
+ global $color, $Email_RegExp_Match;
+ $sbody = $body;
+ $addresses = array();
- /* If there are any changes, it'll just get bigger. */
- if ($Size != strlen($body)) {
- return 1;
+ /* 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 = makeComposeLink('src/compose.php?send_to='.urlencode($email), $email);
+ $body = str_replace($email, $comp_uri, $body);
}
- return 0;
+ /* Return number of unique addresses found */
+ return count($addresses);
}
@@ -82,6 +74,7 @@ $url_parser_url_tokens = array(
'https://',
'ftp://',
'telnet:', // Special case -- doesn't need the slashes
+ 'mailto:', // Special case -- doesn't use the slashes
'gopher://',
'news://');
@@ -91,45 +84,91 @@ $url_parser_poss_ends = array(' ', "\n", "\r", '<', '>', ".\r", ".\n",
']', '[', '{', '}', "\240", ', ', '. ', ",\n", ",\r");
+/**
+ * rfc 2368 (mailto URL) preg_match() regexp
+ * @link http://www.ietf.org/rfc/rfc2368.txt
+ * @global string MailTo_PReg_Match the encapsulated regexp for preg_match()
+ */
+global $MailTo_PReg_Match;
+$Mailto_Email_RegExp = '[0-9a-z%]([-_.+%]?[0-9a-z])*(%' . $Host_RegExp_Match . ')?@' . $Host_RegExp_Match;
+$MailTo_PReg_Match = '/((?:' . $Mailto_Email_RegExp . ')*)((?:\?(?:to|cc|bcc|subject|body)=[^\s\?&=,()]+)?(?:&(?:to|cc|bcc|subject|body)=[^\s\?&=,()]+)*)/i';
+
+/**
+ * Parses a body and converts all found URLs to clickable links.
+ *
+ * @param string body the body to process, by ref
+ * @return void
+ */
function parseUrl (&$body) {
- global $url_parser_poss_ends, $url_parser_url_tokens;;
- $start = 0;
- $target_pos = strlen($body);
-
- while ($start != $target_pos) {
+ global $url_parser_poss_ends, $url_parser_url_tokens;
+ $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 == 'mailto:') { // rfc 2368 (mailto URL)
+ $target_pos += 7; //skip mailto:
+ $end = $blength;
+
+ $mailto = substr($body, $target_pos, $end-$target_pos);
+
+ global $MailTo_PReg_Match;
+ if ((preg_match($MailTo_PReg_Match, $mailto, $regs)) && ($regs[0] != '')) {
+ //sm_print_r($regs);
+ $mailto_before = $target_token . $regs[0];
+ $mailto_params = $regs[10];
+ if ($regs[1]) { //if there is an email addr before '?', we need to merge it with the params
+ $to = 'to=' . $regs[1];
+ if (strpos($mailto_params, 'to=') > -1) //already a 'to='
+ $mailto_params = str_replace('to=', $to . '%2C%20', $mailto_params);
+ else {
+ if ($mailto_params) //already some params, append to them
+ $mailto_params .= '&' . $to;
+ else
+ $mailto_params .= '?' . $to;
+ }
+ }
+ $url_str = str_replace(array('to=', 'cc=', 'bcc='), array('send_to=', 'send_to_cc=', 'send_to_bcc='), $mailto_params);
+ $comp_uri = makeComposeLink('src/compose.php' . $url_str, $mailto_before);
+ replaceBlock($body, $comp_uri, $target_pos - 7, $target_pos + strlen($regs[0]));
+ $target_pos += strlen($comp_uri) - 7;
+ }
+ }
+ else
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 );
@@ -141,16 +180,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);
}
}
?>