holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* eMail: fix stripping too much text, extended: apply solution of r33526 to infolog and tracker, when mail is converted while/after sending

Browse Source
This commit is contained in:
Klaus Leithoff 2011-01-20 12:24:34 +00:00
parent 0670e247e9
commit 1abcbb12fc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infolog/inc/class.infolog_ui.inc.php
View File

@ -1843,12 +1843,14 @@ class infolog_ui
$toaddr = array(); $toaddr = array();
foreach(array('to','cc','bcc') as $x) if (is_array($_to_emailAddress[$x]) && !empty($_to_emailAddress[$x])) $toaddr = array_merge($toaddr,$_to_emailAddress[$x]); foreach(array('to','cc','bcc') as $x) if (is_array($_to_emailAddress[$x]) && !empty($_to_emailAddress[$x])) $toaddr = array_merge($toaddr,$_to_emailAddress[$x]);
//_debug_array($attachments); //_debug_array($attachments);
$_body = strip_tags(bofelamimail::htmlspecialchars($_body)); //we need to fix broken tags (or just stuff like "<800 USD/p" )
$_body = htmlspecialchars_decode($_body,ENT_QUOTES);
$body = bofelamimail::createHeaderInfoSection(array('FROM'=>$_to_emailAddress['from'], $body = bofelamimail::createHeaderInfoSection(array('FROM'=>$_to_emailAddress['from'],
'TO'=>(!empty($_to_emailAddress['to'])?implode(',',$_to_emailAddress['to']):null), 'TO'=>(!empty($_to_emailAddress['to'])?implode(',',$_to_emailAddress['to']):null),
'CC'=>(!empty($_to_emailAddress['cc'])?implode(',',$_to_emailAddress['cc']):null), 'CC'=>(!empty($_to_emailAddress['cc'])?implode(',',$_to_emailAddress['cc']):null),
'BCC'=>(!empty($_to_emailAddress['bcc'])?implode(',',$_to_emailAddress['bcc']):null), 'BCC'=>(!empty($_to_emailAddress['bcc'])?implode(',',$_to_emailAddress['bcc']):null),
'SUBJECT'=>$_subject, 'SUBJECT'=>$_subject,
'DATE'=>bofelamimail::_strtotime($_date))).strip_tags($_body); 'DATE'=>bofelamimail::_strtotime($_date))).$_body;
$this->edit($this->bo->import_mail( $this->edit($this->bo->import_mail(
implode(',',$toaddr),$_subject,$body,$attachments,$_date implode(',',$toaddr),$_subject,$body,$attachments,$_date
)); ));