Log RAW request for #867

This commit is contained in:
the-djmaze 2023-01-22 10:21:03 +01:00
parent c30c41a79b
commit da4b9684b4

View file

@ -156,8 +156,7 @@ trait Raw
$sFileNameOut = $this->MainClearFileName($sFileNameIn, $sContentTypeIn, $sMimeIndex); $sFileNameOut = $this->MainClearFileName($sFileNameIn, $sContentTypeIn, $sMimeIndex);
$rResource = $this->FilesProvider()->GetFile($oAccount, $sFileHashIn); $rResource = $this->FilesProvider()->GetFile($oAccount, $sFileHashIn);
if (\is_resource($rResource)) if (\is_resource($rResource)) {
{
\header('Content-Type: '.$sContentTypeOut); \header('Content-Type: '.$sContentTypeOut);
\header('Content-Disposition: attachment; '. \header('Content-Disposition: attachment; '.
\trim(\MailSo\Base\Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileNameOut))); \trim(\MailSo\Base\Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileNameOut)));
@ -181,14 +180,21 @@ trait Raw
$self = $this; $self = $this;
return $this->MailClient()->MessageMimeStream( return $this->MailClient()->MessageMimeStream(
function($rResource, $sContentType, $sFileName, $sMimeIndex = '') use ( function($rResource, $sContentType, $sFileName, $sMimeIndex = '') use (
$self, $oAccount, $sRawKey, $sContentTypeIn, $sFileNameIn, $bDownload, $bThumbnail, $self, $sRawKey, $sContentTypeIn, $sFileNameIn, $bDownload, $bThumbnail,
$bIsRangeRequest, $sRangeStart, $sRangeEnd $bIsRangeRequest, $sRangeStart, $sRangeEnd
) { ) {
if ($oAccount && \is_resource($rResource)) { if (\is_resource($rResource)) {
\MailSo\Base\Utils::ResetTimeLimit(); \MailSo\Base\Utils::ResetTimeLimit();
$self->cacheByKey($sRawKey); $self->cacheByKey($sRawKey);
$self->Logger()->Write(\print_r([
$sFileName,
$sContentType,
$sFileNameIn,
$sContentTypeIn
],true), \LOG_DEBUG, 'RAW');
if ($sFileNameIn) { if ($sFileNameIn) {
$sFileName = $sFileNameIn; $sFileName = $sFileNameIn;
} }