From 3690ce1b36cf771f1c36f0dc2576c75c4f513ce3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 12 May 2016 16:21:28 +0200 Subject: Move LDAP to PSR-4 --- apps/user_ldap/ajax/getConfiguration.php | 2 +- apps/user_ldap/ajax/setConfiguration.php | 2 +- apps/user_ldap/ajax/testConfiguration.php | 2 +- apps/user_ldap/ajax/wizard.php | 2 +- apps/user_ldap/appinfo/app.php | 2 +- apps/user_ldap/appinfo/register_command.php | 2 +- apps/user_ldap/lib/Command/Search.php | 2 +- apps/user_ldap/lib/Command/TestConfig.php | 2 +- apps/user_ldap/lib/Jobs/CleanUp.php | 2 +- apps/user_ldap/lib/LDAP.php | 302 +++++++++++++++++++++ apps/user_ldap/lib/ldap.php | 301 -------------------- apps/user_ldap/tests/access.php | 2 +- .../tests/integration/abstractintegrationtest.php | 2 +- .../integration/exceptionOnLostConnection.php | 4 +- 14 files changed, 315 insertions(+), 314 deletions(-) create mode 100644 apps/user_ldap/lib/LDAP.php delete mode 100644 apps/user_ldap/lib/ldap.php (limited to 'apps') diff --git a/apps/user_ldap/ajax/getConfiguration.php b/apps/user_ldap/ajax/getConfiguration.php index 795261bc91d..37f780f0eb5 100644 --- a/apps/user_ldap/ajax/getConfiguration.php +++ b/apps/user_ldap/ajax/getConfiguration.php @@ -28,6 +28,6 @@ OCP\JSON::checkAppEnabled('user_ldap'); OCP\JSON::callCheck(); $prefix = (string)$_POST['ldap_serverconfig_chooser']; -$ldapWrapper = new OCA\user_ldap\lib\LDAP(); +$ldapWrapper = new OCA\User_LDAP\LDAP(); $connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix); OCP\JSON::success(array('configuration' => $connection->getConfiguration())); diff --git a/apps/user_ldap/ajax/setConfiguration.php b/apps/user_ldap/ajax/setConfiguration.php index a2e73783e00..34d8e4e24ce 100644 --- a/apps/user_ldap/ajax/setConfiguration.php +++ b/apps/user_ldap/ajax/setConfiguration.php @@ -41,7 +41,7 @@ foreach($chkboxes as $boxid) { } } -$ldapWrapper = new OCA\user_ldap\lib\LDAP(); +$ldapWrapper = new OCA\User_LDAP\LDAP(); $connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix); $connection->setConfiguration($_POST); $connection->saveConfiguration(); diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php index e9f5167bfe7..840ee2bfe09 100644 --- a/apps/user_ldap/ajax/testConfiguration.php +++ b/apps/user_ldap/ajax/testConfiguration.php @@ -30,7 +30,7 @@ OCP\JSON::callCheck(); $l = \OC::$server->getL10N('user_ldap'); -$ldapWrapper = new OCA\user_ldap\lib\LDAP(); +$ldapWrapper = new OCA\User_LDAP\LDAP(); $connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null); //needs to be true, otherwise it will also fail with an irritating message $_POST['ldap_configuration_active'] = 1; diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php index 1d77ff4009d..55a681a007b 100644 --- a/apps/user_ldap/ajax/wizard.php +++ b/apps/user_ldap/ajax/wizard.php @@ -41,7 +41,7 @@ if(!isset($_POST['ldap_serverconfig_chooser'])) { } $prefix = (string)$_POST['ldap_serverconfig_chooser']; -$ldapWrapper = new \OCA\user_ldap\lib\LDAP(); +$ldapWrapper = new \OCA\User_LDAP\LDAP(); $configuration = new \OCA\user_ldap\lib\Configuration($prefix); $con = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null); diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 537bbd48bb2..a6c766f2612 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -29,7 +29,7 @@ OCP\App::registerAdmin('user_ldap', 'settings'); $helper = new \OCA\user_ldap\lib\Helper(); $configPrefixes = $helper->getServerConfigurationPrefixes(true); -$ldapWrapper = new OCA\user_ldap\lib\LDAP(); +$ldapWrapper = new OCA\User_LDAP\LDAP(); $ocConfig = \OC::$server->getConfig(); if(count($configPrefixes) === 1) { $dbc = \OC::$server->getDatabaseConnection(); diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php index 57e1f5e9af5..daddad7dda4 100644 --- a/apps/user_ldap/appinfo/register_command.php +++ b/apps/user_ldap/appinfo/register_command.php @@ -22,7 +22,7 @@ */ use OCA\user_ldap\lib\Helper; -use OCA\user_ldap\lib\LDAP; +use OCA\User_LDAP\LDAP; use OCA\User_LDAP\User_Proxy; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User\DeletedUsersIndex; diff --git a/apps/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php index e5df49016df..77c0271a708 100644 --- a/apps/user_ldap/lib/Command/Search.php +++ b/apps/user_ldap/lib/Command/Search.php @@ -31,7 +31,7 @@ use Symfony\Component\Console\Output\OutputInterface; use OCA\User_LDAP\User_Proxy; use OCA\User_LDAP\Group_Proxy; use OCA\user_ldap\lib\Helper; -use OCA\user_ldap\lib\LDAP; +use OCA\User_LDAP\LDAP; use OCP\IConfig; class Search extends Command { diff --git a/apps/user_ldap/lib/Command/TestConfig.php b/apps/user_ldap/lib/Command/TestConfig.php index 790b9df6637..aa369f1a421 100644 --- a/apps/user_ldap/lib/Command/TestConfig.php +++ b/apps/user_ldap/lib/Command/TestConfig.php @@ -71,7 +71,7 @@ class TestConfig extends Command { * @return int */ protected function testConfig($configID) { - $lw = new \OCA\user_ldap\lib\LDAP(); + $lw = new \OCA\User_LDAP\LDAP(); $connection = new Connection($lw, $configID); //ensure validation is run before we attempt the bind diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php index fb4f37203c1..3bbf897ea19 100644 --- a/apps/user_ldap/lib/Jobs/CleanUp.php +++ b/apps/user_ldap/lib/Jobs/CleanUp.php @@ -26,7 +26,7 @@ use \OC\BackgroundJob\TimedJob; use \OCA\user_ldap\User_LDAP; use \OCA\User_LDAP\User_Proxy; use \OCA\user_ldap\lib\Helper; -use \OCA\user_ldap\lib\LDAP; +use \OCA\User_LDAP\LDAP; use \OCA\User_LDAP\User\DeletedUsersIndex; use \OCA\User_LDAP\Mapping\UserMapping; diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php new file mode 100644 index 00000000000..221f3c8883b --- /dev/null +++ b/apps/user_ldap/lib/LDAP.php @@ -0,0 +1,302 @@ + + * @author Arthur Schiwon + * @author Jörn Friedrich Dreyer + * @author Lukas Reschke + * @author Morris Jobke + * @author Robin McCorkell + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ + +namespace OCA\User_LDAP; + +use OC\ServerNotAvailableException; +use OCA\user_ldap\lib\ILDAPWrapper; + +class LDAP implements ILDAPWrapper { + protected $curFunc = ''; + protected $curArgs = array(); + + /** + * @param resource $link + * @param string $dn + * @param string $password + * @return bool|mixed + */ + public function bind($link, $dn, $password) { + return $this->invokeLDAPMethod('bind', $link, $dn, $password); + } + + /** + * @param string $host + * @param string $port + * @return mixed + */ + public function connect($host, $port) { + if(strpos($host, '://') === false) { + $host = 'ldap://' . $host; + } + if(strpos($host, ':', strpos($host, '://') + 1) === false) { + //ldap_connect ignores port parameter when URLs are passed + $host .= ':' . $port; + } + return $this->invokeLDAPMethod('connect', $host); + } + + /** + * @param LDAP $link + * @param LDAP $result + * @param string $cookie + * @return bool|LDAP + */ + public function controlPagedResultResponse($link, $result, &$cookie) { + $this->preFunctionCall('ldap_control_paged_result_response', + array($link, $result, $cookie)); + $result = ldap_control_paged_result_response($link, $result, $cookie); + $this->postFunctionCall(); + + return $result; + } + + /** + * @param LDAP $link + * @param int $pageSize + * @param bool $isCritical + * @param string $cookie + * @return mixed|true + */ + public function controlPagedResult($link, $pageSize, $isCritical, $cookie) { + return $this->invokeLDAPMethod('control_paged_result', $link, $pageSize, + $isCritical, $cookie); + } + + /** + * @param LDAP $link + * @param LDAP $result + * @return mixed + */ + public function countEntries($link, $result) { + return $this->invokeLDAPMethod('count_entries', $link, $result); + } + + /** + * @param LDAP $link + * @return mixed|string + */ + public function errno($link) { + return $this->invokeLDAPMethod('errno', $link); + } + + /** + * @param LDAP $link + * @return int|mixed + */ + public function error($link) { + return $this->invokeLDAPMethod('error', $link); + } + + /** + * Splits DN into its component parts + * @param string $dn + * @param int @withAttrib + * @return array|false + * @link http://www.php.net/manual/en/function.ldap-explode-dn.php + */ + public function explodeDN($dn, $withAttrib) { + return $this->invokeLDAPMethod('explode_dn', $dn, $withAttrib); + } + + /** + * @param LDAP $link + * @param LDAP $result + * @return mixed + */ + public function firstEntry($link, $result) { + return $this->invokeLDAPMethod('first_entry', $link, $result); + } + + /** + * @param LDAP $link + * @param LDAP $result + * @return array|mixed + */ + public function getAttributes($link, $result) { + return $this->invokeLDAPMethod('get_attributes', $link, $result); + } + + /** + * @param LDAP $link + * @param LDAP $result + * @return mixed|string + */ + public function getDN($link, $result) { + return $this->invokeLDAPMethod('get_dn', $link, $result); + } + + /** + * @param LDAP $link + * @param LDAP $result + * @return array|mixed + */ + public function getEntries($link, $result) { + return $this->invokeLDAPMethod('get_entries', $link, $result); + } + + /** + * @param LDAP $link + * @param resource $result + * @return mixed + */ + public function nextEntry($link, $result) { + return $this->invokeLDAPMethod('next_entry', $link, $result); + } + + /** + * @param LDAP $link + * @param string $baseDN + * @param string $filter + * @param array $attr + * @return mixed + */ + public function read($link, $baseDN, $filter, $attr) { + return $this->invokeLDAPMethod('read', $link, $baseDN, $filter, $attr); + } + + /** + * @param LDAP $link + * @param string $baseDN + * @param string $filter + * @param array $attr + * @param int $attrsOnly + * @param int $limit + * @return mixed + */ + public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0) { + return $this->invokeLDAPMethod('search', $link, $baseDN, $filter, $attr, $attrsOnly, $limit); + } + + /** + * @param LDAP $link + * @param string $option + * @param int $value + * @return bool|mixed + */ + public function setOption($link, $option, $value) { + return $this->invokeLDAPMethod('set_option', $link, $option, $value); + } + + /** + * @param LDAP $link + * @return mixed|true + */ + public function startTls($link) { + return $this->invokeLDAPMethod('start_tls', $link); + } + + /** + * @param resource $link + * @return bool|mixed + */ + public function unbind($link) { + return $this->invokeLDAPMethod('unbind', $link); + } + + /** + * Checks whether the server supports LDAP + * @return boolean if it the case, false otherwise + * */ + public function areLDAPFunctionsAvailable() { + return function_exists('ldap_connect'); + } + + /** + * Checks whether PHP supports LDAP Paged Results + * @return boolean if it the case, false otherwise + * */ + public function hasPagedResultSupport() { + $hasSupport = function_exists('ldap_control_paged_result') + && function_exists('ldap_control_paged_result_response'); + return $hasSupport; + } + + /** + * Checks whether the submitted parameter is a resource + * @param Resource $resource the resource variable to check + * @return bool true if it is a resource, false otherwise + */ + public function isResource($resource) { + return is_resource($resource); + } + + /** + * @return mixed + */ + private function invokeLDAPMethod() { + $arguments = func_get_args(); + $func = 'ldap_' . array_shift($arguments); + if(function_exists($func)) { + $this->preFunctionCall($func, $arguments); + $result = call_user_func_array($func, $arguments); + if ($result === FALSE) { + $this->postFunctionCall(); + } + return $result; + } + } + + /** + * @param string $functionName + * @param array $args + */ + private function preFunctionCall($functionName, $args) { + $this->curFunc = $functionName; + $this->curArgs = $args; + } + + private function postFunctionCall() { + if($this->isResource($this->curArgs[0])) { + $errorCode = ldap_errno($this->curArgs[0]); + $errorMsg = ldap_error($this->curArgs[0]); + if($errorCode !== 0) { + if($this->curFunc === 'ldap_get_entries' + && $errorCode === -4) { + } else if ($errorCode === 32) { + //for now + } else if ($errorCode === 10) { + //referrals, we switch them off, but then there is AD :) + } else if ($errorCode === -1) { + throw new ServerNotAvailableException('Lost connection to LDAP server.'); + } else if ($errorCode === 48) { + throw new \Exception('LDAP authentication method rejected', $errorCode); + } else if ($errorCode === 1) { + throw new \Exception('LDAP Operations error', $errorCode); + } else { + \OCP\Util::writeLog('user_ldap', + 'LDAP error '.$errorMsg.' (' . + $errorCode.') after calling '. + $this->curFunc, + \OCP\Util::DEBUG); + } + } + } + + $this->curFunc = ''; + $this->curArgs = array(); + } +} diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php deleted file mode 100644 index 383d71ca6eb..00000000000 --- a/apps/user_ldap/lib/ldap.php +++ /dev/null @@ -1,301 +0,0 @@ - - * @author Arthur Schiwon - * @author Jörn Friedrich Dreyer - * @author Lukas Reschke - * @author Morris Jobke - * @author Robin McCorkell - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see - * - */ - -namespace OCA\user_ldap\lib; - -use OC\ServerNotAvailableException; - -class LDAP implements ILDAPWrapper { - protected $curFunc = ''; - protected $curArgs = array(); - - /** - * @param resource $link - * @param string $dn - * @param string $password - * @return bool|mixed - */ - public function bind($link, $dn, $password) { - return $this->invokeLDAPMethod('bind', $link, $dn, $password); - } - - /** - * @param string $host - * @param string $port - * @return mixed - */ - public function connect($host, $port) { - if(strpos($host, '://') === false) { - $host = 'ldap://' . $host; - } - if(strpos($host, ':', strpos($host, '://') + 1) === false) { - //ldap_connect ignores port parameter when URLs are passed - $host .= ':' . $port; - } - return $this->invokeLDAPMethod('connect', $host); - } - - /** - * @param LDAP $link - * @param LDAP $result - * @param string $cookie - * @return bool|LDAP - */ - public function controlPagedResultResponse($link, $result, &$cookie) { - $this->preFunctionCall('ldap_control_paged_result_response', - array($link, $result, $cookie)); - $result = ldap_control_paged_result_response($link, $result, $cookie); - $this->postFunctionCall(); - - return $result; - } - - /** - * @param LDAP $link - * @param int $pageSize - * @param bool $isCritical - * @param string $cookie - * @return mixed|true - */ - public function controlPagedResult($link, $pageSize, $isCritical, $cookie) { - return $this->invokeLDAPMethod('control_paged_result', $link, $pageSize, - $isCritical, $cookie); - } - - /** - * @param LDAP $link - * @param LDAP $result - * @return mixed - */ - public function countEntries($link, $result) { - return $this->invokeLDAPMethod('count_entries', $link, $result); - } - - /** - * @param LDAP $link - * @return mixed|string - */ - public function errno($link) { - return $this->invokeLDAPMethod('errno', $link); - } - - /** - * @param LDAP $link - * @return int|mixed - */ - public function error($link) { - return $this->invokeLDAPMethod('error', $link); - } - - /** - * Splits DN into its component parts - * @param string $dn - * @param int @withAttrib - * @return array|false - * @link http://www.php.net/manual/en/function.ldap-explode-dn.php - */ - public function explodeDN($dn, $withAttrib) { - return $this->invokeLDAPMethod('explode_dn', $dn, $withAttrib); - } - - /** - * @param LDAP $link - * @param LDAP $result - * @return mixed - */ - public function firstEntry($link, $result) { - return $this->invokeLDAPMethod('first_entry', $link, $result); - } - - /** - * @param LDAP $link - * @param LDAP $result - * @return array|mixed - */ - public function getAttributes($link, $result) { - return $this->invokeLDAPMethod('get_attributes', $link, $result); - } - - /** - * @param LDAP $link - * @param LDAP $result - * @return mixed|string - */ - public function getDN($link, $result) { - return $this->invokeLDAPMethod('get_dn', $link, $result); - } - - /** - * @param LDAP $link - * @param LDAP $result - * @return array|mixed - */ - public function getEntries($link, $result) { - return $this->invokeLDAPMethod('get_entries', $link, $result); - } - - /** - * @param LDAP $link - * @param resource $result - * @return mixed|an - */ - public function nextEntry($link, $result) { - return $this->invokeLDAPMethod('next_entry', $link, $result); - } - - /** - * @param LDAP $link - * @param string $baseDN - * @param string $filter - * @param array $attr - * @return mixed - */ - public function read($link, $baseDN, $filter, $attr) { - return $this->invokeLDAPMethod('read', $link, $baseDN, $filter, $attr); - } - - /** - * @param LDAP $link - * @param string $baseDN - * @param string $filter - * @param array $attr - * @param int $attrsOnly - * @param int $limit - * @return mixed - */ - public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0) { - return $this->invokeLDAPMethod('search', $link, $baseDN, $filter, $attr, $attrsOnly, $limit); - } - - /** - * @param LDAP $link - * @param string $option - * @param int $value - * @return bool|mixed - */ - public function setOption($link, $option, $value) { - return $this->invokeLDAPMethod('set_option', $link, $option, $value); - } - - /** - * @param LDAP $link - * @return mixed|true - */ - public function startTls($link) { - return $this->invokeLDAPMethod('start_tls', $link); - } - - /** - * @param resource $link - * @return bool|mixed - */ - public function unbind($link) { - return $this->invokeLDAPMethod('unbind', $link); - } - - /** - * Checks whether the server supports LDAP - * @return boolean if it the case, false otherwise - * */ - public function areLDAPFunctionsAvailable() { - return function_exists('ldap_connect'); - } - - /** - * Checks whether PHP supports LDAP Paged Results - * @return boolean if it the case, false otherwise - * */ - public function hasPagedResultSupport() { - $hasSupport = function_exists('ldap_control_paged_result') - && function_exists('ldap_control_paged_result_response'); - return $hasSupport; - } - - /** - * Checks whether the submitted parameter is a resource - * @param Resource $resource the resource variable to check - * @return bool true if it is a resource, false otherwise - */ - public function isResource($resource) { - return is_resource($resource); - } - - /** - * @return mixed - */ - private function invokeLDAPMethod() { - $arguments = func_get_args(); - $func = 'ldap_' . array_shift($arguments); - if(function_exists($func)) { - $this->preFunctionCall($func, $arguments); - $result = call_user_func_array($func, $arguments); - if ($result === FALSE) { - $this->postFunctionCall(); - } - return $result; - } - } - - /** - * @param string $functionName - * @param array $args - */ - private function preFunctionCall($functionName, $args) { - $this->curFunc = $functionName; - $this->curArgs = $args; - } - - private function postFunctionCall() { - if($this->isResource($this->curArgs[0])) { - $errorCode = ldap_errno($this->curArgs[0]); - $errorMsg = ldap_error($this->curArgs[0]); - if($errorCode !== 0) { - if($this->curFunc === 'ldap_get_entries' - && $errorCode === -4) { - } else if ($errorCode === 32) { - //for now - } else if ($errorCode === 10) { - //referrals, we switch them off, but then there is AD :) - } else if ($errorCode === -1) { - throw new ServerNotAvailableException('Lost connection to LDAP server.'); - } else if ($errorCode === 48) { - throw new \Exception('LDAP authentication method rejected', $errorCode); - } else if ($errorCode === 1) { - throw new \Exception('LDAP Operations error', $errorCode); - } else { - \OCP\Util::writeLog('user_ldap', - 'LDAP error '.$errorMsg.' (' . - $errorCode.') after calling '. - $this->curFunc, - \OCP\Util::DEBUG); - } - } - } - - $this->curFunc = ''; - $this->curArgs = array(); - } -} diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php index 3f74551eaec..ef5c09393b8 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/access.php @@ -209,7 +209,7 @@ class Test_Access extends \Test\TestCase { public function testStringResemblesDNLDAPmod() { list($lw, $con, $um) = $this->getConnectorAndLdapMock(); - $lw = new \OCA\user_ldap\lib\LDAP(); + $lw = new \OCA\User_LDAP\LDAP(); $access = new Access($con, $lw, $um); if(!function_exists('ldap_explode_dn')) { diff --git a/apps/user_ldap/tests/integration/abstractintegrationtest.php b/apps/user_ldap/tests/integration/abstractintegrationtest.php index ff9bc9b46e7..73b4d6667d7 100644 --- a/apps/user_ldap/tests/integration/abstractintegrationtest.php +++ b/apps/user_ldap/tests/integration/abstractintegrationtest.php @@ -23,7 +23,7 @@ namespace OCA\user_ldap\tests\integration; use OCA\user_ldap\lib\Access; use OCA\user_ldap\lib\Connection; -use OCA\user_ldap\lib\LDAP; +use OCA\User_LDAP\LDAP; use OCA\User_LDAP\User\Manager; abstract class AbstractIntegrationTest { diff --git a/apps/user_ldap/tests/integration/exceptionOnLostConnection.php b/apps/user_ldap/tests/integration/exceptionOnLostConnection.php index 4813bd9ff5e..007c1116d05 100644 --- a/apps/user_ldap/tests/integration/exceptionOnLostConnection.php +++ b/apps/user_ldap/tests/integration/exceptionOnLostConnection.php @@ -20,7 +20,7 @@ */ use OC\ServerNotAvailableException; -use OCA\user_ldap\lib\LDAP; +use OCA\User_LDAP\LDAP; /** * Class ExceptionOnLostConnection @@ -51,7 +51,7 @@ class ExceptionOnLostConnection { /** @var string */ private $ldapHost; - /** @var OCA\user_ldap\lib\LDAP */ + /** @var \OCA\User_LDAP\LDAP */ private $ldap; /** @var bool */ -- cgit v1.2.3