extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-27 05:11:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix use of mail->add registry use for mailto links in mailbody

Browse Source
This commit is contained in:
Klaus Leithoff 2014-03-03 14:50:43 +00:00
parent 11d6da9b5a
commit d044c02ae8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/inc/class.mail_ui.inc.php
View File

@ -2301,7 +2301,7 @@ unset($query['actions']);
} }
$addAction = egw_link::get_registry('mail','add'); $addAction = egw_link::get_registry('mail','add');
$linkData = array ( $linkData = array (
'menuaction' => $addAction, 'menuaction' => $addAction['menuaction'],
'send_to' => base64_encode($newSenderAddress) 'send_to' => base64_encode($newSenderAddress)
); );
$link = egw::link('/index.php',$linkData); $link = egw::link('/index.php',$linkData);
@ -2353,7 +2353,7 @@ unset($query['actions']);
$addAction = egw_link::get_registry('mail','add'); $addAction = egw_link::get_registry('mail','add');
if ($decode) $addrEMail = mail_bo::decode_header($addrEMail,true); if ($decode) $addrEMail = mail_bo::decode_header($addrEMail,true);
$linkData = array ( $linkData = array (
'menuaction' => $addAction, 'menuaction' => $addAction['menuaction'],
'send_to' => base64_encode($addressData['EMAIL']) 'send_to' => base64_encode($addressData['EMAIL'])
); );
$link = egw::link('/index.php',$linkData); $link = egw::link('/index.php',$linkData);
@ -2987,10 +2987,11 @@ blockquote[type=cite] {
$newBody = preg_replace_callback("/background=(\"|\')cid:(.*)(\"|\')/iU",array($this,'image_callback_background'),$newBody); $newBody = preg_replace_callback("/background=(\"|\')cid:(.*)(\"|\')/iU",array($this,'image_callback_background'),$newBody);
} }
$addAction = egw_link::get_registry('mail','add'); $addAction = egw_link::get_registry('mail','add');
// create links for email addresses // create links for email addresses
if ($modifyURI) if ($modifyURI)
{ {
$link = egw::link('/index.php',array('menuaction' => $addAction)); $link = egw::link('/index.php',array('menuaction' => $addAction['menuaction']));
$newBody = preg_replace("/href=(\"|\')mailto:([\w,\-,\/,\?,\=,\.,&,!\n,\%,@,\*,#,:,~,\+]+)(\"|\')/ie", $newBody = preg_replace("/href=(\"|\')mailto:([\w,\-,\/,\?,\=,\.,&,!\n,\%,@,\*,#,:,~,\+]+)(\"|\')/ie",
"'href=\"$link&send_to='.base64_encode('$2').'\"'.' target=\"compose\" onclick=\"window.open(this,this.target,\'dependent=yes,width=700,height=egw_getWindowOuterHeight(),location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;\"'", $newBody); "'href=\"$link&send_to='.base64_encode('$2').'\"'.' target=\"compose\" onclick=\"window.open(this,this.target,\'dependent=yes,width=700,height=egw_getWindowOuterHeight(),location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;\"'", $newBody);
//print "<pre>".htmlentities($newBody)."</pre><hr>"; //print "<pre>".htmlentities($newBody)."</pre><hr>";