the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-24 06:47:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

Resolve #1425

Browse source
This commit is contained in:
the-djmaze 2024-02-18 16:44:20 +01:00
parent 86f084e5a9
commit 8a0b3d3791
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/nextcloud/index.php
View file

@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
{
const
NAME = 'Nextcloud',
VERSION = '2.30',
RELEASE = '2024-02-08',
VERSION = '2.31',
RELEASE = '2024-02-18',
CATEGORY = 'Integrations',
DESCRIPTION = 'Integrate with Nextcloud v20+',
REQUIRED = '2.34.0';
@ -119,7 +119,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
{
$sSaveFolder = \ltrim($this->jsonParam('folder', ''), '/');
// $aValues = \RainLoop\Api::Actions()->decodeRawKey($this->jsonParam('msgHash', ''));
$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($this->jsonParam('msgHash', '')), true);
$msgHash = $this->jsonParam('msgHash', '');
$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($msgHash), true);
$aResult = [
'folder' => '',
'filename' => '',
@ -139,7 +140,10 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
$oFiles->is_dir($sSaveFolder) || $oFiles->mkdir($sSaveFolder);
}
$aResult['folder'] = $sSaveFolder;
$aResult['filename'] = ($this->jsonParam('filename', '') ?: \date('YmdHis')) . '.eml';
$aResult['filename'] = \MailSo\Base\Utils::SecureFileName(
\mb_substr($this->jsonParam('filename', '') ?: \date('YmdHis'), 0, 100)
) . '.' . \md5($msgHash) . '.eml';
$oMailClient->MessageMimeStream(
function ($rResource) use ($oFiles, $aResult) {

2
plugins/nextcloud/js/message.js
View file

@ -100,7 +100,7 @@
{
'msgHash': msg.requestHash,
'folder': folder,
'filename': msg.subject() + '-' + msg.requestHash
'filename': msg.subject()
}
);
});

2
plugins/nextcloud/js/messagelist.js
View file

@ -19,7 +19,7 @@
{
'msgHash': msg.requestHash,
'folder': folder,
'filename': msg.subject() + '-' + msg.requestHash
'filename': msg.subject()
}
);
});