mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
Small fixes
This commit is contained in:
parent
860ac47f6c
commit
909cd45769
2 changed files with 8 additions and 17 deletions
13
.travis.yml
13
.travis.yml
|
|
@ -1,13 +0,0 @@
|
||||||
language: php
|
|
||||||
php:
|
|
||||||
- '5.4'
|
|
||||||
- '5.5'
|
|
||||||
- '5.6'
|
|
||||||
# - '7.0'
|
|
||||||
# - '7.1'
|
|
||||||
#before_script:
|
|
||||||
# - sudo apt-get install -y build-essential libssl-dev
|
|
||||||
# - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash
|
|
||||||
# - nvm install 4.4.5
|
|
||||||
# - nvm use 4.4.5
|
|
||||||
# - npm install -g eslint babel-eslint
|
|
||||||
|
|
@ -15,12 +15,12 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
private $sAccessDn = NULL;
|
private $sAccessDn = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
private $sAccessPassword = NULL;
|
private $sAccessPassword = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
|
|
@ -202,11 +202,15 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
|
||||||
|
|
||||||
if (!@\ldap_bind($oCon, $this->sAccessDn, $this->sAccessPassword))
|
if (!@\ldap_bind($oCon, $this->sAccessDn, $this->sAccessPassword))
|
||||||
{
|
{
|
||||||
if ( is_null($this->sAccessDn) ) {
|
if (is_null($this->sAccessDn))
|
||||||
|
{
|
||||||
$this->logLdapError($oCon, 'ldap_bind (anonymous)');
|
$this->logLdapError($oCon, 'ldap_bind (anonymous)');
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
$this->logLdapError($oCon, 'ldap_bind');
|
$this->logLdapError($oCon, 'ldap_bind');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $aResult;
|
return $aResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue