From 909cd45769e1d1b3ef27a3317521d3a8d9fc11c7 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Thu, 28 Mar 2019 01:44:29 +0300 Subject: [PATCH] Small fixes --- .travis.yml | 13 ------------- .../LdapContactsSuggestions.php | 12 ++++++++---- 2 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 298545297..000000000 --- a/.travis.yml +++ /dev/null @@ -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 diff --git a/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php b/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php index 24f466118..f8c985709 100644 --- a/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php +++ b/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php @@ -15,12 +15,12 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges /** * @var string */ - private $sAccessDn = NULL; + private $sAccessDn = null; /** * @var string */ - private $sAccessPassword = NULL; + private $sAccessPassword = null; /** * @var string @@ -202,11 +202,15 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges if (!@\ldap_bind($oCon, $this->sAccessDn, $this->sAccessPassword)) { - if ( is_null($this->sAccessDn) ) { + if (is_null($this->sAccessDn)) + { $this->logLdapError($oCon, 'ldap_bind (anonymous)'); - } else { + } + else + { $this->logLdapError($oCon, 'ldap_bind'); } + return $aResult; }