Optimization: Email suggestions (#821)

This commit is contained in:
RainLoop Team 2015-09-21 21:07:27 +03:00
parent c69faa4264
commit 9b517feca3
2 changed files with 27 additions and 12 deletions

View file

@ -116,3 +116,17 @@
} }
} }
} }
.popups {
.b-open-pgp-key-add-content {
&.modal {
width: 645px;
.inputKey {
width: 600px;
}
}
}
}

View file

@ -1505,23 +1505,24 @@ class PdoAddressBook
$sNickItem = isset($aNicks[$iId]) ? $aNicks[$iId] : ''; $sNickItem = isset($aNicks[$iId]) ? $aNicks[$iId] : '';
foreach ($aItems as $sEmail) foreach ($aItems as $sEmail)
{
if ($sEmail)
{ {
if ($bName) if ($bName)
{ {
$aResult[] = array($sEmail, $sNameItem); $aResult[] = array($sEmail, $sNameItem);
} }
else if ($bNick)
if ($bNick)
{ {
$aResult[] = array($sEmail, $sNickItem); $aResult[] = array($sEmail, $sNickItem);
} }
else
if (!$bName && !$bNick)
{ {
$aResult[] = array($sEmail, ''); $aResult[] = array($sEmail, '');
} }
} }
} }
}
else else
{ {
$aNameItem = isset($aNames[$iId]) && \is_array($aNames[$iId]) ? $aNames[$iId] : array('', ''); $aNameItem = isset($aNames[$iId]) && \is_array($aNames[$iId]) ? $aNames[$iId] : array('', '');