From 0a60c27e06620ef7e62f005a8c28ae3ef1c62699 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Wed, 7 Apr 2021 13:26:58 +0200
Subject: [PATCH] https://github.com/RainLoop/rainloop-webmail/issues/2087

---
 .../libraries/RainLoop/Actions/Contacts.php   |  5 +----
 .../libraries/RainLoop/Actions/Folders.php    |  5 +----
 .../libraries/RainLoop/Actions/Messages.php   | 20 ++++---------------
 .../Providers/AddressBook/PdoAddressBook.php  |  5 +----
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
index c01da9b07..a8a635fca 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
@@ -97,10 +97,7 @@ trait Contacts
 		$oAccount = $this->getAccountFromToken();
 		$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
 
-		$aFilteredUids = \array_filter($aUids, function (&$mUid) {
-			$mUid = (int) \trim($mUid);
-			return 0 < $mUid;
-		});
+		$aFilteredUids = \array_filter(\array_map('intval', $aUids));
 
 		$bResult = false;
 		if (0 < \count($aFilteredUids) && $this->AddressBookProvider($oAccount)->IsActive())
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 551a26659..9ccc85810 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
@@ -358,10 +358,7 @@ trait Folders
 		if (0 < strlen($sFlagsUids))
 		{
 			$aFlagsUids = explode(',', $sFlagsUids);
-			$aFlagsFilteredUids = array_filter($aFlagsUids, function (&$sUid) {
-				$sUid = (int) trim($sUid);
-				return 0 < (int) trim($sUid);
-			});
+			$aFlagsFilteredUids = \array_filter(\array_map('intval', $aFlagsUids));
 		}
 
 		$this->initMailClientConnection();
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 8b8f0352e..163e7bad8 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
@@ -510,10 +510,7 @@ trait Messages
 		$sFolder = $this->GetActionParam('Folder', '');
 		$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
 
-		$aFilteredUids = \array_filter($aUids, function (&$sUid) {
-			$sUid = (int) \trim($sUid);
-			return 0 < $sUid;
-		});
+		$aFilteredUids = \array_filter(\array_map('intval', $aUids));
 
 		try
 		{
@@ -563,10 +560,7 @@ trait Messages
 		$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
 		$bMarkAsRead = !empty($this->GetActionParam('MarkAsRead', '0'));
 
-		$aFilteredUids = \array_filter($aUids, function (&$mUid) {
-			$mUid = (int) \trim($mUid);
-			return 0 < $mUid;
-		});
+		$aFilteredUids = \array_filter(\array_map('intval', $aUids));
 
 		if ($bMarkAsRead)
 		{
@@ -629,10 +623,7 @@ trait Messages
 		$sToFolder = $this->GetActionParam('ToFolder', '');
 		$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
 
-		$aFilteredUids = \array_filter($aUids, function (&$mUid) {
-			$mUid = (int) \trim($mUid);
-			return 0 < $mUid;
-		});
+		$aFilteredUids = \array_filter(\array_map('intval', $aUids));
 
 		try
 		{
@@ -866,10 +857,7 @@ trait Messages
 		$sFolder = $this->GetActionParam('Folder', '');
 		$bSetAction = '1' === (string) $this->GetActionParam('SetAction', '0');
 		$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
-		$aFilteredUids = \array_filter($aUids, function (&$sUid) {
-			$sUid = (int) \trim($sUid);
-			return 0 < $sUid;
-		});
+		$aFilteredUids = \array_filter(\array_map('intval', $aUids));
 
 		try
 		{
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index e1d0f391a..1b737a501 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -902,10 +902,7 @@ class PdoAddressBook
 
 		$iUserID = $this->getUserId($sEmail);
 
-		$aContactIds = \array_filter($aContactIds, function (&$mItem) {
-			$mItem = (int) \trim($mItem);
-			return 0 < $mItem;
-		});
+		$aContactIds = \array_filter(\array_map('intval', $aContactIds));
 
 		if (0 === \count($aContactIds))
 		{