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

* Mail: fix for problem when retrieving and displaying an event from winmail.dat attachment

Browse Source
This commit is contained in:
Klaus Leithoff 2016-03-03 14:27:05 +00:00
parent 4787b3e81e
commit eec9fa33ac
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2755,11 +2755,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
{ {
if (strtolower($attach['mimeType']) == 'text/calendar' && if (strtolower($attach['mimeType']) == 'text/calendar' &&
isset($GLOBALS['egw_info']['user']['apps']['calendar']) && isset($GLOBALS['egw_info']['user']['apps']['calendar']) &&
($attachment = $this->mail_bo->getAttachment($uid, $attach['partID'],0,(strtolower($attach['mimeType']) == 'text/calendar'?false:true)))) ($attachment = $this->mail_bo->getAttachment($uid, $attach['partID'],$attach['is_winmail'],(strtolower($attach['mimeType']) == 'text/calendar'?false:true))))
{
$ical = new calendar_ical();
$ical_charset = $attach['charset'] ? $attach['charset'] : 'utf-8';
if (($events = $ical->icaltoegw($attachment['attachment'], '', $ical_charset)))
{ {
//error_log(__METHOD__.__LINE__.array2string($attachment)); //error_log(__METHOD__.__LINE__.array2string($attachment));
egw_cache::setSession('calendar', 'ical', array( egw_cache::setSession('calendar', 'ical', array(
@ -2774,12 +2770,6 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
array('event'=>null,'msg'=>'','useSession'=>true) array('event'=>null,'msg'=>'','useSession'=>true)
); );
} }
else
{
error_log(__METHOD__.__LINE__.'Cannot import the following as ical:'.array2string($attachment));
//$bodyParts[] = array('body'=>$attachment['attachment'], 'charSet'=>$attach['charset'] ? $attach['charset'] : 'utf-8');
}
}
} }
// Compose the content of the frame // Compose the content of the frame
$frameHtml = $frameHtml =