extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

plain text/calendar messages, are now displayed as event.ics attachment too

Browse Source
This commit is contained in:
Klaus Leithoff 2010-06-11 09:26:07 +00:00
parent 5f47910187
commit 464d08eb0d
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
felamimail/inc/class.bofelamimail.inc.php
View File

@ -1783,7 +1783,7 @@
function getTextPart($_uid, $_structure, $_htmlMode = '')
{
$bodyPart = array();
//_debug_array($_structure);
if (self::$debug) _debug_array(array($_structure,function_backtrace()));
$partID = $_structure->partID;
$mimePartBody = $this->icServer->getBodyPart($_uid, $partID, true);
//_debug_array($mimePartBody);
@ -2260,7 +2260,18 @@
#return $attachments;
}
// outlook sometimes sends a TEXT/CALENDAR;REQUEST as plain ics, nothing more.
if ($structure->type == 'TEXT' && $structure->subType == 'CALENDAR' &&
isset($structure->parameters['METHOD'] ) && $structure->parameters['METHOD'] == 'REQUEST')
{
$newAttachment = array();
$newAttachment['name'] = 'event.ics';
$newAttachment['size'] = $structure->bytes;
$newAttachment['mimeType'] = $structure->type .'/'. $structure->subType.';'.$structure->parameters['METHOD'];
$newAttachment['partID'] = $structure->partID;
$newAttachment['encoding'] = $structure->encoding;
$attachments[] = $newAttachment;
}
// this kind of message can have no attachments
if(($structure->type == 'TEXT' && !($structure->disposition == 'INLINE' && $structure->dparameters['FILENAME'])) ||
($structure->type == 'MULTIPART' && $structure->subType == 'ALTERNATIVE' && !is_array($structure->subParts)) ||
@ -2271,7 +2282,7 @@
#$attachments = array();
foreach($structure->subParts as $subPart) {
foreach((array)$structure->subParts as $subPart) {
// skip all non attachment parts
if(($subPart->type == 'TEXT' && ($subPart->subType == 'PLAIN' || $subPart->subType == 'HTML') && ($subPart->disposition != 'ATTACHMENT' &&
!($subPart->disposition == 'INLINE' && $subPart->dparameters['FILENAME']))) ||

10
felamimail/inc/class.uiwidgets.inc.php
View File

@ -369,11 +369,12 @@
$this->t->set_var('header_subject', @htmlspecialchars('('. lang('no subject') .')', ENT_QUOTES, $this->displayCharset));
}
#_debug_array($header);
//_debug_array($header);
if($header['mimetype'] == 'multipart/mixed' ||
$header['mimetype'] == 'multipart/related' ||
substr($header['mimetype'],0,11) == 'application' ||
substr($header['mimetype'],0,5) == 'audio') {
$header['mimetype'] == 'multipart/related' ||
$header['mimetype'] == 'text/calendar' ||
substr($header['mimetype'],0,11) == 'application' ||
substr($header['mimetype'],0,5) == 'audio') {
$image = html::image('felamimail','attach');
$this->t->set_var('attachment_image', $image);
} else {
@ -634,6 +635,7 @@
$windowName = 'displayMessage_'.$headerData['uid'];
if($headerData['mimetype'] == 'multipart/mixed' ||
$headerData['mimetype'] == 'multipart/related' ||
$headerData['mimetype'] == 'text/calendar' ||
substr($headerData['mimetype'],0,11) == 'application' ||
substr($headerData['mimetype'],0,5) == 'audio') {
$image = html::image('felamimail','attach');