mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 08:23:12 +01:00
added missing echo in uifelamimail; recognize plain VIDEO messages (only video, nothing else)-> display as attachment
This commit is contained in:
parent
c976639dc1
commit
323ced6205
@ -2234,7 +2234,7 @@
|
||||
if (self::$debug) _debug_array($structure);
|
||||
$attachments = array();
|
||||
// this kind of messages contain only the attachment and no body
|
||||
if($structure->type == 'APPLICATION' || $structure->type == 'AUDIO' || $structure->type == 'IMAGE')
|
||||
if($structure->type == 'APPLICATION' || $structure->type == 'AUDIO' || $structure->type == 'VIDEO' || $structure->type == 'IMAGE')
|
||||
{
|
||||
$newAttachment = array();
|
||||
$newAttachment['name'] = self::getFileNameFromStructure($structure);
|
||||
@ -2394,6 +2394,7 @@
|
||||
}
|
||||
|
||||
break;
|
||||
case 'VIDEO':
|
||||
case 'AUDIO': // some servers send audiofiles and imagesfiles directly, without any stuff surround it
|
||||
case 'IMAGE': // they are displayed as Attachment NOT INLINE
|
||||
return array(
|
||||
|
@ -512,7 +512,7 @@
|
||||
|
||||
$this->t->parse("out","main");
|
||||
print $this->t->get('out','main');
|
||||
$GLOBALS['egw']->framework->footer(false);
|
||||
echo $GLOBALS['egw']->framework->footer(false);
|
||||
exit;
|
||||
}
|
||||
$this->t->set_var('activeFolder',$urlMailbox);
|
||||
|
@ -374,7 +374,8 @@
|
||||
$header['mimetype'] == 'multipart/related' ||
|
||||
$header['mimetype'] == 'text/calendar' ||
|
||||
substr($header['mimetype'],0,11) == 'application' ||
|
||||
substr($header['mimetype'],0,5) == 'audio') {
|
||||
substr($header['mimetype'],0,5) == 'audio' ||
|
||||
substr($header['mimetype'],0,5) == 'video') {
|
||||
$image = html::image('felamimail','attach');
|
||||
$this->t->set_var('attachment_image', $image);
|
||||
} else {
|
||||
@ -637,7 +638,8 @@
|
||||
$headerData['mimetype'] == 'multipart/related' ||
|
||||
$headerData['mimetype'] == 'text/calendar' ||
|
||||
substr($headerData['mimetype'],0,11) == 'application' ||
|
||||
substr($headerData['mimetype'],0,5) == 'audio') {
|
||||
substr($headerData['mimetype'],0,5) == 'audio' ||
|
||||
substr($headerData['mimetype'],0,5) == 'video') {
|
||||
$image = html::image('felamimail','attach');
|
||||
|
||||
$image = "<a name=\"subject_url\" href=\"#\"
|
||||
|
Loading…
Reference in New Issue
Block a user