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

fixing a problem regarding the import of draft-messages with attachments into infolog (, fixing a display issue with getAttachments in uicompose as well)

Browse Source
This commit is contained in:
Klaus Leithoff 2009-11-28 18:16:18 +00:00
parent 30dd2980e6
commit 0473f987ad
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
infolog/inc/class.infolog_ui.inc.php
View File

@ -1426,14 +1426,15 @@ class infolog_ui
if (is_array($_attachments))
{
//echo __METHOD__.'<br>';
//_debug_array($_attachments);
$bofelamimail = CreateObject('felamimail.bofelamimail',$GLOBALS['egw']->translation->charset());
$bopreferences = CreateObject('felamimail.bopreferences');
$bofelamimail->openConnection();
foreach ($_attachments as $attachment)
{
if ($attachment['type'] == 'MESSAGE/RFC822')
{
$bofelamimail = CreateObject('felamimail.bofelamimail',$GLOBALS['egw']->translation->charset());
$bopreferences = CreateObject('felamimail.bopreferences');
$bofelamimail->openConnection();
$bofelamimail->reopen($attachment['folder']);
$mailcontent = self::get_mailcontent($bofelamimail,$attachment['uid'],$attachment['partID'],$attachment['folder']);
@ -1445,6 +1446,17 @@ class infolog_ui
}
else
{
if (!empty($attachment['folder']))
{
$is_winmail = $_GET['is_winmail'] ? $_GET['is_winmail'] : 0;
$bofelamimail->reopen($attachment['folder']);
$attachmentData = $bofelamimail->getAttachment($attachment['uid'],$attachment['partID'],$is_winmail);
$attachment['file'] =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
$tmpfile = fopen($attachment['file'],'w');
fwrite($tmpfile,$attachmentData['attachment']);
fclose($tmpfile);
}
$attachments[] = array(
'name' => $attachment['name'],
'mimeType' => $attachment['type'],
@ -1453,6 +1465,7 @@ class infolog_ui
);
}
}
$bofelamimail->closeConnection();
}
//_debug_array($attachments);
$body = strip_tags($_body);
@ -1502,7 +1515,7 @@ class infolog_ui
$subject = $bofelamimail->decode_header($headers['SUBJECT']);
$message = self::getdisplayableBody($bofelamimail, $bodyParts);
//echo __METHOD__.'<br>';
//_debug_array($attachments);
if (is_array($attachments))
{