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

Use Actions()->decodeRawKey()

Browse source
This commit is contained in:
the-djmaze 2023-03-28 10:02:22 +02:00
parent 3819311a6d
commit 9a4da9d7f0
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1087,7 +1087,7 @@ class Actions
return \MailSo\Base\Utils::UrlSafeBase64Encode(\json_encode($aValues)); return \MailSo\Base\Utils::UrlSafeBase64Encode(\json_encode($aValues));
} }
protected function decodeRawKey(string $sRawKey): array public function decodeRawKey(string $sRawKey): array
{ {
return empty($sRawKey) ? [] return empty($sRawKey) ? []
: (\json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true) ?: []); : (\json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true) ?: []);

7
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
View file

@ -23,8 +23,7 @@ trait Messages
// throw new ClientException(Notifications::CantGetMessageList); // throw new ClientException(Notifications::CantGetMessageList);
$oParams = new \MailSo\Mail\MessageListParams; $oParams = new \MailSo\Mail\MessageListParams;
$sRawKey = $this->GetActionParam('RawKey', ''); $aValues = $this->decodeRawKey($this->GetActionParam('RawKey', ''));
$aValues = $sRawKey ? \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true) : null;
$sHash = ''; $sHash = '';
if ($aValues && 6 < \count($aValues)) { if ($aValues && 6 < \count($aValues)) {
// GET // GET
@ -404,9 +403,7 @@ trait Messages
*/ */
public function DoMessage() : array public function DoMessage() : array
{ {
$sRawKey = (string) $this->GetActionParam('RawKey', ''); $aValues = $this->decodeRawKey((string) $this->GetActionParam('RawKey', ''));
$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true);
if ($aValues && 2 <= \count($aValues)) { if ($aValues && 2 <= \count($aValues)) {
$sFolder = (string) $aValues[0]; $sFolder = (string) $aValues[0];
$iUid = (int) $aValues[1]; $iUid = (int) $aValues[1];