extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

adapt view and save attachments to horde stuff (winmail.dat may require changes later)

Browse Source
This commit is contained in:
Klaus Leithoff 2013-11-20 09:30:25 +00:00
parent cd99f101a1
commit 8e336ed31a
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mail/inc/class.mail_bo.inc.php
View File

@ -4438,10 +4438,12 @@ class mail_bo
* @param int _uid the uid of the message * @param int _uid the uid of the message
* @param string _partID the id of the part, which holds the attachment * @param string _partID the id of the part, which holds the attachment
* @param int _winmail_nr winmail.dat attachment nr. * @param int _winmail_nr winmail.dat attachment nr.
* @param boolean _returnPart flag to indicate if the attachment is to be returned as horde mime part object
* @param boolean _stream flag to indicate if the attachment is to be fetched or returned as filepointer
* *
* @return array * @return array
*/ */
function getAttachment($_uid, $_partID, $_winmail_nr=0) function getAttachment($_uid, $_partID, $_winmail_nr=0, $_returnPart=true, $_stream=false)
{ {
$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox()); $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
@ -4464,41 +4466,25 @@ class mail_bo
if ($part->getDisposition()=='attachment') if ($part->getDisposition()=='attachment')
{ {
$headerObject['ATTACHMENTS'][$mime_id]=$part->getAllDispositionParameters(); $headerObject['ATTACHMENTS'][$mime_id]=$part->getAllDispositionParameters();
error_log(__METHOD__.__LINE__.array2string($headerObject['ATTACHMENTS'][$mime_id]));
$structure_encoding = $headerObject['ATTACHMENTS'][$mime_id]['encoding'];
$structure_bytes = $part->getBytes(); $structure_bytes = $part->getBytes();
$structure_mime=$mime_type; $structure_mime=$mime_type;
$structure_partID=$mime_id; $structure_partID=$mime_id;
$structure_name=$part->getName(); $filename=$part->getName();
$attachment = $_headerObject->getBodyPart($mime_id); $this->fetchPartContents($_uid, $part, $_stream, $_preserveSeen=false);
if ($_returnPart) return $part;
} }
} }
} }
} }
switch ($structure_encoding) {
case 'BASE64':
// use imap_base64 to decode
$attachment = imap_base64($attachment);
break;
case 'QUOTED-PRINTABLE':
// use imap_qprint to decode
#$attachment = imap_qprint($attachment);
$attachment = quoted_printable_decode($attachment);
break;
default:
// it is either not encoded or we don't know about it
}
if ($structure_type === 'TEXT' && isset($structure->parameters['CHARSET']) && stripos('UTF-16',$structure->parameters['CHARSET'])!==false)
{
$attachment = translation::convert($attachment,$structure->parameters['CHARSET'],self::$displayCharset);
}
$ext = mime_magic::mime2ext($structure->type .'/'. $structure->subType); $ext = mime_magic::mime2ext($structure->type .'/'. $structure->subType);
if ($ext && stripos($filename,'.')===false && stripos($filename,$ext)===false) $filename = trim($filename).'.'.$ext; if ($ext && stripos($filename,'.')===false && stripos($filename,$ext)===false) $filename = trim($filename).'.'.$ext;
$attachmentData = array( $attachmentData = array(
'type' => $structure->type .'/'. $structure->subType, 'type' => $structure_mime,
'filename' => $filename, 'filename' => $filename,
'attachment' => $attachment 'attachment' => $part->getContents(array('stream'=>$_stream))
); );
/*
// try guessing the mimetype, if we get the application/octet-stream // try guessing the mimetype, if we get the application/octet-stream
if (strtolower($attachmentData['type']) == 'application/octet-stream') $attachmentData['type'] = mime_magic::filename2mime($attachmentData['filename']); if (strtolower($attachmentData['type']) == 'application/octet-stream') $attachmentData['type'] = mime_magic::filename2mime($attachmentData['filename']);
# if the attachment holds a winmail number and is a winmail.dat then we have to handle that. # if the attachment holds a winmail number and is a winmail.dat then we have to handle that.
@ -4513,6 +4499,7 @@ error_log(__METHOD__.__LINE__.array2string($headerObject['ATTACHMENTS'][$mime_id
'attachment' => $wmattach['attachment'], 'attachment' => $wmattach['attachment'],
); );
} }
*/
return $attachmentData; return $attachmentData;
} }

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

@ -2103,7 +2103,7 @@ unset($query['actions']);
$is_winmail = $_GET['is_winmail'] ? $_GET['is_winmail'] : 0; $is_winmail = $_GET['is_winmail'] ? $_GET['is_winmail'] : 0;
$this->mail_bo->reopen($mailbox); $this->mail_bo->reopen($mailbox);
$attachment = $this->mail_bo->getAttachment($uid,$part,$is_winmail); $attachment = $this->mail_bo->getAttachment($uid,$part,$is_winmail,false);
$this->mail_bo->closeConnection(); $this->mail_bo->closeConnection();
$GLOBALS['egw']->session->commit_session(); $GLOBALS['egw']->session->commit_session();

2
mail/js/app.js
View File

@ -500,7 +500,7 @@ app.classes.mail = AppJS.extend(
this.mail_disablePreviewArea(true); this.mail_disablePreviewArea(true);
return; return;
} }
console.log("mail_preview",dataElem); //console.log("mail_preview",dataElem);
this.mail_selectedMails.push(_id); this.mail_selectedMails.push(_id);
var subject =dataElem.data.subject; var subject =dataElem.data.subject;
this.mail_disablePreviewArea(false); this.mail_disablePreviewArea(false);