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

Fixed ownCloud contacts suggestions

Browse source
This commit is contained in:
RainLoop Team 2015-02-18 15:52:00 +04:00
parent 587c05fc54
commit eefbeff4b9
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
View file

@ -31,6 +31,9 @@ class OwnCloudSuggestions implements \RainLoop\Providers\Suggestions\ISuggestion
} }
$aSearchResult = \OCP\Contacts::search($sQuery, array('FN', 'EMAIL')); $aSearchResult = \OCP\Contacts::search($sQuery, array('FN', 'EMAIL'));
//$this->oLogger->WriteDump($aSearchResult);
$aPreResult = array();
if (\is_array($aSearchResult) && 0 < \count($aSearchResult)) if (\is_array($aSearchResult) && 0 < \count($aSearchResult))
{ {
foreach ($aSearchResult as $aContact) foreach ($aSearchResult as $aContact)
@ -51,22 +54,35 @@ class OwnCloudSuggestions implements \RainLoop\Providers\Suggestions\ISuggestion
$mEmails = array($mEmails); $mEmails = array($mEmails);
} }
if (!isset($aPreResult[$sUid]))
{
$aPreResult[$sUid] = array();
}
foreach ($mEmails as $sEmail) foreach ($mEmails as $sEmail)
{ {
$sEmail = \trim($sEmail); $sEmail = \trim($sEmail);
if (!empty($sEmail)) if (!empty($sEmail))
{ {
$iLimit--; $iLimit--;
$aResult[$sUid] = array($sEmail, $sFullName); $aPreResult[$sUid][] = array($sEmail, $sFullName);
} }
} }
} }
} }
$aResult = \array_values($aResult); $aPreResult = \array_values($aPreResult);
// $this->oLogger->WriteDump($aPreResult);
foreach ($aPreResult as $aData)
{
foreach ($aData as $aSubData)
{
$aResult[] = $aSubData;
}
}
} }
unset($aSearchResult); unset($aSearchResult, $aPreResult);
} }
catch (\Exception $oException) catch (\Exception $oException)
{ {