Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 00:47:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #1514

Browse source
This commit is contained in:
the-djmaze 2024-03-24 15:03:50 +01:00
parent b45459d645
commit 3513669412
1 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

60
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Attachments.php
View file

@ -17,6 +17,15 @@ trait Attachments
$sFilename = \MailSo\Base\Utils::SecureFileName($this->GetActionParam('filename', '')); $sFilename = \MailSo\Base\Utils::SecureFileName($this->GetActionParam('filename', ''));
$aHashes = $this->GetActionParam('hashes', null); $aHashes = $this->GetActionParam('hashes', null);
$oFilesProvider = $this->FilesProvider(); $oFilesProvider = $this->FilesProvider();
if (empty($sAction)) {
$this->logWrite('AttachmentsAction target not set');
}
if (!$this->GetCapa(Capa::ATTACHMENTS_ACTIONS)) {
$this->logWrite('AttachmentsAction disabled');
}
if (!$oFilesProvider || !$oFilesProvider->IsActive()) {
$this->logWrite('AttachmentsAction FilesProvider inactive');
}
if (empty($sAction) || !$this->GetCapa(Capa::ATTACHMENTS_ACTIONS) || !$oFilesProvider || !$oFilesProvider->IsActive()) { if (empty($sAction) || !$this->GetCapa(Capa::ATTACHMENTS_ACTIONS) || !$oFilesProvider || !$oFilesProvider->IsActive()) {
return $this->FalseResponse(); return $this->FalseResponse();
} }
@ -31,6 +40,7 @@ trait Attachments
foreach ($aHashes as $sZipHash) { foreach ($aHashes as $sZipHash) {
$aResult = $this->getMimeFileByHash($oAccount, $sZipHash); $aResult = $this->getMimeFileByHash($oAccount, $sZipHash);
if (empty($aResult['data']) && empty($aResult['fileHash'])) { if (empty($aResult['data']) && empty($aResult['fileHash'])) {
$this->logWrite('AttachmentsAction data/fileHash not set: ' . \print_r($aResult,1));
$bError = true; $bError = true;
break; break;
} }
@ -151,34 +161,32 @@ trait Attachments
$aValues['fileHash'] = null; $aValues['fileHash'] = null;
if (isset($aValues['data'])) { if (isset($aValues['data'])) {
$aValues['data'] = \MailSo\Base\Utils::UrlSafeBase64Decode($aValues['data']); $aValues['data'] = \MailSo\Base\Utils::UrlSafeBase64Decode($aValues['data']);
} else { } else if (!empty($aValues['folder']) && !empty($aValues['uid'])) {
$sFolder = isset($aValues['folder']) ? (string) $aValues['folder'] : ''; $sFolder = (string) $aValues['folder'];
$iUid = isset($aValues['uid']) ? (int) $aValues['uid'] : 0; $iUid = (int) $aValues['uid'];
$sMimeIndex = isset($aValues['mimeIndex']) ? (string) $aValues['mimeIndex'] : ''; $sMimeIndex = (string) $aValues['mimeIndex'];
if ($sFolder && $iUid && $sMimeIndex) { $oFileProvider = $this->FilesProvider();
$oFileProvider = $this->FilesProvider(); $mResult = $this->MailClient()->MessageMimeStream(
$mResult = $this->MailClient()->MessageMimeStream( function ($rResource, $sContentType, $sFileName, $sMimeIndex = '')
function ($rResource, $sContentType, $sFileName, $sMimeIndex = '') use ($oAccount, $oFileProvider, &$aValues) {
use ($oAccount, $oFileProvider, &$aValues) { unset($sContentType, $sFileName, $sMimeIndex);
unset($sContentType, $sFileName, $sMimeIndex); if (\is_resource($rResource)) {
if (\is_resource($rResource)) { $sContentTypeIn = isset($aValues['mimeType']) ? (string) $aValues['mimeType'] : '';
$sContentTypeIn = isset($aValues['mimeType']) ? (string) $aValues['mimeType'] : ''; $sHash = \MailSo\Base\Utils::Sha1Rand($aValues['fileName'].'~'.$sContentTypeIn);
$sHash = \MailSo\Base\Utils::Sha1Rand($aValues['fileName'].'~'.$sContentTypeIn); $rTempResource = $oFileProvider->GetFile($oAccount, $sHash, 'wb+');
$rTempResource = $oFileProvider->GetFile($oAccount, $sHash, 'wb+'); if (\is_resource($rTempResource)) {
if (\is_resource($rTempResource)) { if (-1 < \MailSo\Base\Utils::WriteStream($rResource, $rTempResource)) {
if (-1 < \MailSo\Base\Utils::WriteStream($rResource, $rTempResource)) { $sResultHash = $sHash;
$sResultHash = $sHash; $aValues['fileHash'] = $sHash;
$aValues['fileHash'] = $sHash;
}
\fclose($rTempResource);
} }
\fclose($rTempResource);
} }
}, }
$sFolder, },
$iUid, $sFolder,
$sMimeIndex $iUid,
); $sMimeIndex
} );
} }
return $aValues; return $aValues;