extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 10:51:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail: rework parsing of email adresses and making compose links out of them

Browse Source
This commit is contained in:
Klaus Leithoff 2013-04-30 12:53:56 +00:00
parent ed6c8028b6
commit 883bc6f60f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
felamimail/inc/class.uidisplay.inc.php
View File

@ -93,7 +93,7 @@
#$atext = '([a-z0-9!#$&%*+/=?^_`{|}~-]|&)';
$atext = '([a-zA-Z0-9_\-\.])';
$dot_atom = $atext.'+(\.'.$atext.'+)*';
$Email_RegExp_Match = '~'.$dot_atom.'(%'.$Host_RegExp_Match.')?@'.$Host_RegExp_Match.'~i';
$Email_RegExp_Match = '~(\[|<|>|\&lt;|\s)+('.$dot_atom.'(%'.$Host_RegExp_Match.')?@'.$Host_RegExp_Match.')(\]|>|<|\&gt;|\s)+~i';
$this->t = CreateObject('phpgwapi.Template',EGW_APP_TPL);
$this->displayCharset = $GLOBALS['egw']->translation->charset();
@ -152,9 +152,12 @@
$i = 0;
/* Find all the email addresses in the body */
// stop cold after 100 adresses, as this is very time consuming
//error_log(__METHOD__.__LINE__.'->'.$Email_RegExp_Match);
//error_log(__METHOD__.__LINE__.'->'.$sbody);
while(preg_match($Email_RegExp_Match, $sbody, $regs) && $i<=100) {
//_debug_array($regs);
$addresses[$regs[0]] = strtr($regs[0], array('&amp;' => '&'));
//error_log(array2string($regs));
// regs[0] is what we found; regs[2] is the emailaddress in question
$addresses[$regs[0]] = strtr($regs[2], array('&amp;' => '&'));
$start = strpos($sbody, $regs[0]) + strlen($regs[0]);
$sbody = substr($sbody, $start);
$i++;
@ -167,15 +170,16 @@
if ($lmail == $email) next($addresses);
//echo __METHOD__.' Text:'.$text."#<br>";
//echo $email."#<br>";
$comp_uri = $this->makeComposeLink($email, $text);
$comp_uri = $this->makeComposeLink($email, $email);
//echo __METHOD__.' Uri:'.$comp_uri.'#<br>';
$body = str_replace($text, $comp_uri, $body);
$body = str_replace($text, str_replace($email,$comp_uri,$text), $body);
$lmail=$email;
}
/* Return number of unique addresses found */
return count($addresses);
}
function parseHREF (&$body) {
#echo __METHOD__."called<br>";
$webserverURL = $GLOBALS['egw_info']['server']['webserver_url'];