Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync RainLoop v1.16

Browse source
This commit is contained in:
djmaze 2021-05-14 11:21:31 +02:00
parent 30ff459535
commit f6bba786ed
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
View file

@ -65,7 +65,7 @@ class SubStreams
$sHashName = \MailSo\Base\Utils::Md5Rand(); $sHashName = \MailSo\Base\Utils::Md5Rand();
self::$aStreams[$sHashName] = array_map(function($mItem) { self::$aStreams[$sHashName] = \array_map(function ($mItem) {
return \is_resource($mItem) ? $mItem : return \is_resource($mItem) ? $mItem :
\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString($mItem); \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString($mItem);
}, $aSubStreams); }, $aSubStreams);

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

@ -351,7 +351,7 @@ trait Folders
$aFlagsFilteredUids = array(); $aFlagsFilteredUids = array();
if (0 < strlen($sFlagsUids)) if (0 < strlen($sFlagsUids))
{ {
$aFlagsUids = explode(',', $sFlagsUids); $aFlagsUids = \explode(',', $sFlagsUids);
$aFlagsFilteredUids = \array_filter(\array_map('intval', $aFlagsUids)); $aFlagsFilteredUids = \array_filter(\array_map('intval', $aFlagsUids));
} }

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

@ -557,9 +557,9 @@ trait Messages
$sFromFolder = $this->GetActionParam('FromFolder', ''); $sFromFolder = $this->GetActionParam('FromFolder', '');
$sToFolder = $this->GetActionParam('ToFolder', ''); $sToFolder = $this->GetActionParam('ToFolder', '');
$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$bMarkAsRead = !empty($this->GetActionParam('MarkAsRead', '0')); $bMarkAsRead = !empty($this->GetActionParam('MarkAsRead', '0'));
$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$aFilteredUids = \array_filter(\array_map('intval', $aUids)); $aFilteredUids = \array_filter(\array_map('intval', $aUids));
if ($bMarkAsRead) if ($bMarkAsRead)
@ -621,8 +621,8 @@ trait Messages
$sFromFolder = $this->GetActionParam('FromFolder', ''); $sFromFolder = $this->GetActionParam('FromFolder', '');
$sToFolder = $this->GetActionParam('ToFolder', ''); $sToFolder = $this->GetActionParam('ToFolder', '');
$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$aFilteredUids = \array_filter(\array_map('intval', $aUids)); $aFilteredUids = \array_filter(\array_map('intval', $aUids));
try try

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

@ -89,7 +89,7 @@ class Api
if (!empty($sSslCafile) || !empty($sSslCapath)) if (!empty($sSslCafile) || !empty($sSslCapath))
{ {
\MailSo\Hooks::Add('Net.NetClient.StreamContextSettings/Filter', function (&$aStreamContextSettings) use ($sSslCafile, $sSslCapath) { \MailSo\Hooks::Add('Net.NetClient.StreamContextSettings/Filter', function ($aStreamContextSettings) use ($sSslCafile, $sSslCapath) {
if (isset($aStreamContextSettings['ssl']) && \is_array($aStreamContextSettings['ssl'])) if (isset($aStreamContextSettings['ssl']) && \is_array($aStreamContextSettings['ssl']))
{ {
if (empty($aStreamContextSettings['ssl']['cafile']) && !empty($sSslCafile)) if (empty($aStreamContextSettings['ssl']['cafile']) && !empty($sSslCafile))

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

@ -257,7 +257,7 @@ abstract class AbstractConfig
{ {
$sDesk = \str_replace("\r", '', $mParamValue[1]); $sDesk = \str_replace("\r", '', $mParamValue[1]);
$aDesk = \explode("\n", $sDesk); $aDesk = \explode("\n", $sDesk);
$aDesk = \array_map(function (&$sLine) { $aDesk = \array_map(function ($sLine) {
return '; '.$sLine; return '; '.$sLine;
}, $aDesk); }, $aDesk);