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

fix importMail for vfsfiles

Browse Source
This commit is contained in:
Klaus Leithoff 2013-10-04 10:18:13 +00:00
parent 7c3d0776dd
commit 53299cfce6
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2779,28 +2779,22 @@ blockquote[type=cite] {
function importMessage($content=null) function importMessage($content=null)
{ {
//error_log(__METHOD__.__LINE__.$this->mail_bo->getDraftFolder()); //error_log(__METHOD__.__LINE__.$this->mail_bo->getDraftFolder());
if (isset($_REQUEST['file']) && isset($_REQUEST['folder']))
{
$path = $_REQUEST['file'];
$target = $_REQUEST['folder'];
$content['divImportArea']['FOLDER'][0]=$target;
$content['divImportArea']['uploadForImport'] = array(
'name' => egw_vfs::basename($path),
'type' => egw_vfs::mime_content_type($path),
'file' => egw_vfs::PREFIX.$path,
'size' => filesize(egw_vfs::PREFIX.$path),
);
}
if (!empty($content)) if (!empty($content))
{ {
//error_log(__METHOD__.__LINE__.array2string($content)); error_log(__METHOD__.__LINE__.array2string($content));
$destination = html::purify($content['divImportArea']['FOLDER'][0]?$content['divImportArea']['FOLDER'][0]:''); $content['divImportArea']['vfsfile'] = array(
'name' => egw_vfs::basename($content['divImportArea']['vfsfile']),
'type' => egw_vfs::mime_content_type($content['divImportArea']['vfsfile']),
'file' => egw_vfs::PREFIX.$content['divImportArea']['vfsfile'],
'size' => filesize(egw_vfs::PREFIX.$content['divImportArea']['vfsfile']),
);
$destination = $content['divImportArea']['FOLDER'][0];
$importID = mail_bo::getRandomString(); $importID = mail_bo::getRandomString();
$importFailed = false; $importFailed = false;
try try
{ {
$messageUid = $this->importMessageToFolder($content['divImportArea']['uploadForImport'],$destination,$importID); $messageUid = $this->importMessageToFolder($content['divImportArea']['vfsfile'],$destination,$importID);
$linkData = array $linkData = array
( (
'id' => $this->createRowID($destination, $messageUid, true), 'id' => $this->createRowID($destination, $messageUid, true),