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

* notification: if sending meeting requests: only send the text/plain part, as outlook interprets the html part as meeting description

Browse Source
This commit is contained in:
Klaus Leithoff 2012-01-06 11:34:15 +00:00
parent 06ae9da6e1
commit 94b69703e4
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
notifications/inc/class.notifications_email.inc.php
View File

@ -97,15 +97,25 @@ class notifications_email implements notifications_iface {
$this->mail->FromName = $this->sender->account_fullname; $this->mail->FromName = $this->sender->account_fullname;
$this->mail->Subject = $_subject; $this->mail->Subject = $_subject;
//error_log(__METHOD__.__LINE__.array2string($_attachments)); //error_log(__METHOD__.__LINE__.array2string($_attachments));
$isMeetingRequestNotif = false;
if ($_attachments && stripos($_attachments[0]->type,"text/calendar; method=")!==false) if ($_attachments && stripos($_attachments[0]->type,"text/calendar; method=")!==false)
{ {
$this->mail->AltExtended = $_attachments[0]->string; $this->mail->AltExtended = $_attachments[0]->string;
$this->mail->AltExtendedContentType = $_attachments[0]->type; $this->mail->AltExtendedContentType = $_attachments[0]->type;
unset($_attachments[0]); unset($_attachments[0]);
$isMeetingRequestNotif = true;
}
// do not send html part if this is a meeting request notification
$this->mail->IsHTML(($isMeetingRequestNotif?false:true));
if ($isMeetingRequestNotif===false)
{
$this->mail->Body = $body_html;
$this->mail->AltBody = $body_plain;
}
else
{
$this->mail->Body = $body_plain;
} }
$this->mail->IsHTML(true);
$this->mail->Body = $body_html;
$this->mail->AltBody = $body_plain;
if(is_array($_attachments) && count($_attachments) > 0) if(is_array($_attachments) && count($_attachments) > 0)
{ {
foreach($_attachments as $attachment) foreach($_attachments as $attachment)