extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-27 16:29:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure the content type map is available on accessing a known/wanted attachment part

Browse Source
This commit is contained in:
Klaus Leithoff 2013-11-20 10:00:16 +00:00
parent 8e336ed31a
commit 9bc3c57239
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4462,6 +4462,7 @@ class mail_bo
if ($_partID != '') if ($_partID != '')
{ {
$mailStructureObject = $_headerObject->getStructure(); $mailStructureObject = $_headerObject->getStructure();
$mailStructureObject->contentTypeMap();
$part = $mailStructureObject->getPart($_partID); $part = $mailStructureObject->getPart($_partID);
if ($part->getDisposition()=='attachment') if ($part->getDisposition()=='attachment')
{ {
@ -4727,7 +4728,7 @@ class mail_bo
} }
else else
{ {
$attachments[$num] = array_merge($attachments[$num],$mailClass->getAttachment($uid, $attachment['partID'])); $attachments[$num] = array_merge($attachments[$num],$mailClass->getAttachment($uid, $attachment['partID'],0,false,false));
if (isset($attachments[$num]['charset'])) { if (isset($attachments[$num]['charset'])) {
if ($attachments[$num]['charset']===false) $attachments[$num]['charset'] = translation::detect_encoding($attachments[$num]['attachment']); if ($attachments[$num]['charset']===false) $attachments[$num]['charset'] = translation::detect_encoding($attachments[$num]['attachment']);
translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']); translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']);

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

@ -1108,6 +1108,7 @@ unset($query['actions']);
$sRToFetch = null; $sRToFetch = null;
$_folderName=(!empty($query['selectedFolder'])?$query['selectedFolder']:$this->mail_bo->profileID.self::$delimiter.'INBOX'); $_folderName=(!empty($query['selectedFolder'])?$query['selectedFolder']:$this->mail_bo->profileID.self::$delimiter.'INBOX');
list($_profileID,$folderName) = explode(self::$delimiter,$_folderName,2); list($_profileID,$folderName) = explode(self::$delimiter,$_folderName,2);
if (strpos($folderName,self::$delimiter)!==false) list($app,$_profileID,$folderName) = explode(self::$delimiter,$_folderName,3);
if (is_numeric($_profileID)) if (is_numeric($_profileID))
{ {
if ($_profileID && $_profileID != $this->mail_bo->profileID) if ($_profileID && $_profileID != $this->mail_bo->profileID)