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

added missing echo in uifelamimail; recognize plain VIDEO messages (only video, nothing else)-> display as attachment

Browse Source
This commit is contained in:
Klaus Leithoff 2010-06-15 09:22:26 +00:00
parent c976639dc1
commit 323ced6205
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2234,7 +2234,7 @@
if (self::$debug) _debug_array($structure); if (self::$debug) _debug_array($structure);
$attachments = array(); $attachments = array();
// this kind of messages contain only the attachment and no body // 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 = array();
$newAttachment['name'] = self::getFileNameFromStructure($structure); $newAttachment['name'] = self::getFileNameFromStructure($structure);
@ -2394,6 +2394,7 @@
} }
break; break;
case 'VIDEO':
case 'AUDIO': // some servers send audiofiles and imagesfiles directly, without any stuff surround it case 'AUDIO': // some servers send audiofiles and imagesfiles directly, without any stuff surround it
case 'IMAGE': // they are displayed as Attachment NOT INLINE case 'IMAGE': // they are displayed as Attachment NOT INLINE
return array( return array(

2
felamimail/inc/class.uifelamimail.inc.php
View File

@ -512,7 +512,7 @@
$this->t->parse("out","main"); $this->t->parse("out","main");
print $this->t->get('out','main'); print $this->t->get('out','main');
$GLOBALS['egw']->framework->footer(false); echo $GLOBALS['egw']->framework->footer(false);
exit; exit;
} }
$this->t->set_var('activeFolder',$urlMailbox); $this->t->set_var('activeFolder',$urlMailbox);

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

@ -374,7 +374,8 @@
$header['mimetype'] == 'multipart/related' || $header['mimetype'] == 'multipart/related' ||
$header['mimetype'] == 'text/calendar' || $header['mimetype'] == 'text/calendar' ||
substr($header['mimetype'],0,11) == 'application' || 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'); $image = html::image('felamimail','attach');
$this->t->set_var('attachment_image', $image); $this->t->set_var('attachment_image', $image);
} else { } else {
@ -637,7 +638,8 @@
$headerData['mimetype'] == 'multipart/related' || $headerData['mimetype'] == 'multipart/related' ||
$headerData['mimetype'] == 'text/calendar' || $headerData['mimetype'] == 'text/calendar' ||
substr($headerData['mimetype'],0,11) == 'application' || 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 = html::image('felamimail','attach');
$image = "<a name=\"subject_url\" href=\"#\" $image = "<a name=\"subject_url\" href=\"#\"