djmaze 2021-04-07 13:26:58 +02:00
parent 687afdef6a
commit 0a60c27e06
4 changed files with 7 additions and 28 deletions

View file

@ -97,10 +97,7 @@ trait Contacts
$oAccount = $this->getAccountFromToken(); $oAccount = $this->getAccountFromToken();
$aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); $aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$aFilteredUids = \array_filter($aUids, function (&$mUid) { $aFilteredUids = \array_filter(\array_map('intval', $aUids));
$mUid = (int) \trim($mUid);
return 0 < $mUid;
});
$bResult = false; $bResult = false;
if (0 < \count($aFilteredUids) && $this->AddressBookProvider($oAccount)->IsActive()) if (0 < \count($aFilteredUids) && $this->AddressBookProvider($oAccount)->IsActive())

View file

@ -358,10 +358,7 @@ trait Folders
if (0 < strlen($sFlagsUids)) if (0 < strlen($sFlagsUids))
{ {
$aFlagsUids = explode(',', $sFlagsUids); $aFlagsUids = explode(',', $sFlagsUids);
$aFlagsFilteredUids = array_filter($aFlagsUids, function (&$sUid) { $aFlagsFilteredUids = \array_filter(\array_map('intval', $aFlagsUids));
$sUid = (int) trim($sUid);
return 0 < (int) trim($sUid);
});
} }
$this->initMailClientConnection(); $this->initMailClientConnection();

View file

@ -510,10 +510,7 @@ trait Messages
$sFolder = $this->GetActionParam('Folder', ''); $sFolder = $this->GetActionParam('Folder', '');
$aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); $aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$aFilteredUids = \array_filter($aUids, function (&$sUid) { $aFilteredUids = \array_filter(\array_map('intval', $aUids));
$sUid = (int) \trim($sUid);
return 0 < $sUid;
});
try try
{ {
@ -563,10 +560,7 @@ trait Messages
$aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); $aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$bMarkAsRead = !empty($this->GetActionParam('MarkAsRead', '0')); $bMarkAsRead = !empty($this->GetActionParam('MarkAsRead', '0'));
$aFilteredUids = \array_filter($aUids, function (&$mUid) { $aFilteredUids = \array_filter(\array_map('intval', $aUids));
$mUid = (int) \trim($mUid);
return 0 < $mUid;
});
if ($bMarkAsRead) if ($bMarkAsRead)
{ {
@ -629,10 +623,7 @@ trait Messages
$sToFolder = $this->GetActionParam('ToFolder', ''); $sToFolder = $this->GetActionParam('ToFolder', '');
$aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); $aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$aFilteredUids = \array_filter($aUids, function (&$mUid) { $aFilteredUids = \array_filter(\array_map('intval', $aUids));
$mUid = (int) \trim($mUid);
return 0 < $mUid;
});
try try
{ {
@ -866,10 +857,7 @@ trait Messages
$sFolder = $this->GetActionParam('Folder', ''); $sFolder = $this->GetActionParam('Folder', '');
$bSetAction = '1' === (string) $this->GetActionParam('SetAction', '0'); $bSetAction = '1' === (string) $this->GetActionParam('SetAction', '0');
$aUids = \explode(',', (string) $this->GetActionParam('Uids', '')); $aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
$aFilteredUids = \array_filter($aUids, function (&$sUid) { $aFilteredUids = \array_filter(\array_map('intval', $aUids));
$sUid = (int) \trim($sUid);
return 0 < $sUid;
});
try try
{ {

View file

@ -902,10 +902,7 @@ class PdoAddressBook
$iUserID = $this->getUserId($sEmail); $iUserID = $this->getUserId($sEmail);
$aContactIds = \array_filter($aContactIds, function (&$mItem) { $aContactIds = \array_filter(\array_map('intval', $aContactIds));
$mItem = (int) \trim($mItem);
return 0 < $mItem;
});
if (0 === \count($aContactIds)) if (0 === \count($aContactIds))
{ {