From f6bba786eda967e5730dffdfa1c21aff65d4b219 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Fri, 14 May 2021 11:21:31 +0200
Subject: [PATCH] Sync RainLoop v1.16

---
 .../app/libraries/MailSo/Base/StreamWrappers/SubStreams.php   | 2 +-
 snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php | 2 +-
 .../v/0.0.0/app/libraries/RainLoop/Actions/Messages.php       | 4 ++--
 snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php    | 2 +-
 snappymail/v/0.0.0/app/libraries/RainLoop/Api.php             | 2 +-
 .../v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
index 0db5757ef..7b699ec19 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
@@ -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);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
index 366f1303b..06a9df318 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
@@ -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));
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index 163e7bad8..6b4d23096 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -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
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
index 31e25bd2f..6952bbdc6 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
@@ -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);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
index 8eec86cf5..e0e726af7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
@@ -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))
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
index 3b097bda7..4c0627d0b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
@@ -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);