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

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2014-11-13 02:59:23 +04:00
parent 6266b50c03
commit d5c68d1761
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rainloop/v/0.0.0/app/src/RainLoop/Actions.php
View file

@ -292,7 +292,7 @@ class Actions
{ {
$this->KeenIO('Install'); $this->KeenIO('Install');
} }
catch (\Exception $oException) {} catch (\Exception $oException) { unset($oException); }
} }
} }
@ -5767,20 +5767,27 @@ class Actions
if ($iLimit > \count($aResult) && 0 < \strlen($sQuery)) if ($iLimit > \count($aResult) && 0 < \strlen($sQuery))
{ {
// Address Book try
$oAddressBookProvider = $this->AddressBookProvider($oAccount);
if ($oAddressBookProvider && $oAddressBookProvider->IsActive())
{ {
$aSuggestions = $oAddressBookProvider->GetSuggestions($oAccount->ParentEmailHelper(), $sQuery, $iLimit); // Address Book
if (0 === \count($aResult)) $oAddressBookProvider = $this->AddressBookProvider($oAccount);
if ($oAddressBookProvider && $oAddressBookProvider->IsActive())
{ {
$aResult = $aSuggestions; $aSuggestions = $oAddressBookProvider->GetSuggestions($oAccount->ParentEmailHelper(), $sQuery, $iLimit);
} if (0 === \count($aResult))
else {
{ $aResult = $aSuggestions;
$aResult = \array_merge($aResult, $aSuggestions); }
else
{
$aResult = \array_merge($aResult, $aSuggestions);
}
} }
} }
catch (\Exception $oException)
{
$this->Logger()->WriteException($oException);
}
} }
if ($iLimit < \count($aResult)) if ($iLimit < \count($aResult))

5
rainloop/v/0.0.0/app/src/RainLoop/Common/PdoAbstract.php
View file

@ -72,6 +72,11 @@ abstract class PdoAbstract
throw new \Exception('Unknown PDO SQL connection type'); throw new \Exception('Unknown PDO SQL connection type');
} }
if (empty($sDsn))
{
throw new \Exception('Empty PDO DSN configuration');
}
$this->sDbType = $sType; $this->sDbType = $sType;
$oPdo = false; $oPdo = false;