sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix typo and comment

remotes/origin/poc-doctrine-migrations
Morris Jobke 2015-04-02 15:05:37 +07:00 committed by Jörn Friedrich Dreyer
parent a85bc5538f
commit 1427ea78d4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/user_ldap/lib/connection.php
Unescape Escape View File

@ -56,7 +56,7 @@ class Connection extends LDAPUtility {
//cache handler
protected $cache;
//settings handler
/** @var Configuration settings handler **/
protected $configuration;
protected $doNotValidate = false;
@ -169,7 +169,7 @@ class Connection extends LDAPUtility {
$this->establishConnection();
}
if(is_null($this->ldapConnectionRes)) {
\OCP\Util::writeLog('user_ldap', 'No LDAP Connection to server ' . $this->connection->ldapHost, \OCP\Util::ERROR);
\OCP\Util::writeLog('user_ldap', 'No LDAP Connection to server ' . $this->configuration->ldapHost, \OCP\Util::ERROR);
throw new ServerNotAvailableException('Connection to LDAP server could not be established');
}
return $this->ldapConnectionRes;

2
apps/user_ldap/lib/user/manager.php
Unescape Escape View File

@ -168,7 +168,7 @@ class Manager {
/**
* @brief returns a User object by it's DN or ownCloud username
* @param string the username of the user
* @param string the DN or username of the user
* @return \OCA\user_ldap\lib\user\User|\OCA\user_ldap\lib\user\OfflineUser|null
* @throws \Exception when connection could not be established
*/