fix typo and comment

This commit is contained in:
Morris Jobke 2015-04-02 15:05:37 +02:00 committed by Jörn Friedrich Dreyer
parent a85bc5538f
commit 1427ea78d4
2 changed files with 3 additions and 3 deletions

View File

@ -56,7 +56,7 @@ class Connection extends LDAPUtility {
//cache handler //cache handler
protected $cache; protected $cache;
//settings handler /** @var Configuration settings handler **/
protected $configuration; protected $configuration;
protected $doNotValidate = false; protected $doNotValidate = false;
@ -169,7 +169,7 @@ class Connection extends LDAPUtility {
$this->establishConnection(); $this->establishConnection();
} }
if(is_null($this->ldapConnectionRes)) { 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'); throw new ServerNotAvailableException('Connection to LDAP server could not be established');
} }
return $this->ldapConnectionRes; return $this->ldapConnectionRes;

View File

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