mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-10 06:58:27 +03:00
Sync RainLoop v1.16
This commit is contained in:
parent
30ff459535
commit
f6bba786ed
6 changed files with 7 additions and 7 deletions
|
|
@ -65,7 +65,7 @@ class SubStreams
|
|||
|
||||
$sHashName = \MailSo\Base\Utils::Md5Rand();
|
||||
|
||||
self::$aStreams[$sHashName] = array_map(function($mItem) {
|
||||
self::$aStreams[$sHashName] = \array_map(function ($mItem) {
|
||||
return \is_resource($mItem) ? $mItem :
|
||||
\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString($mItem);
|
||||
}, $aSubStreams);
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ trait Folders
|
|||
$aFlagsFilteredUids = array();
|
||||
if (0 < strlen($sFlagsUids))
|
||||
{
|
||||
$aFlagsUids = explode(',', $sFlagsUids);
|
||||
$aFlagsUids = \explode(',', $sFlagsUids);
|
||||
$aFlagsFilteredUids = \array_filter(\array_map('intval', $aFlagsUids));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -557,9 +557,9 @@ trait Messages
|
|||
|
||||
$sFromFolder = $this->GetActionParam('FromFolder', '');
|
||||
$sToFolder = $this->GetActionParam('ToFolder', '');
|
||||
$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
|
||||
$bMarkAsRead = !empty($this->GetActionParam('MarkAsRead', '0'));
|
||||
|
||||
$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
|
||||
$aFilteredUids = \array_filter(\array_map('intval', $aUids));
|
||||
|
||||
if ($bMarkAsRead)
|
||||
|
|
@ -621,8 +621,8 @@ trait Messages
|
|||
|
||||
$sFromFolder = $this->GetActionParam('FromFolder', '');
|
||||
$sToFolder = $this->GetActionParam('ToFolder', '');
|
||||
$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
|
||||
|
||||
$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
|
||||
$aFilteredUids = \array_filter(\array_map('intval', $aUids));
|
||||
|
||||
try
|
||||
|
|
|
|||
|
|
@ -539,7 +539,7 @@ trait User
|
|||
|
||||
$sResultHash = '';
|
||||
|
||||
$mResult = $this->MailClient()->MessageMimeStream(function($rResource, $sContentType, $sFileName, $sMimeIndex = '')
|
||||
$mResult = $this->MailClient()->MessageMimeStream(function ($rResource, $sContentType, $sFileName, $sMimeIndex = '')
|
||||
use ($oAccount, $oFileProvider, $sFileNameIn, $sContentTypeIn, &$sResultHash) {
|
||||
|
||||
unset($sContentType, $sFileName, $sMimeIndex);
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ class Api
|
|||
|
||||
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 (empty($aStreamContextSettings['ssl']['cafile']) && !empty($sSslCafile))
|
||||
|
|
|
|||
|
|
@ -257,7 +257,7 @@ abstract class AbstractConfig
|
|||
{
|
||||
$sDesk = \str_replace("\r", '', $mParamValue[1]);
|
||||
$aDesk = \explode("\n", $sDesk);
|
||||
$aDesk = \array_map(function (&$sLine) {
|
||||
$aDesk = \array_map(function ($sLine) {
|
||||
return '; '.$sLine;
|
||||
}, $aDesk);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue