summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-04-02 15:05:37 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2015-04-10 09:12:37 +0200
commit1427ea78d40bbfdc54d7ce603a96232b11f5a405 (patch)
tree431e22a0472bbfe216135e92ec189bdd3db589e4 /apps
parenta85bc5538fbc5013e386058f3b1caf191e94b148 (diff)
downloadnextcloud-server-1427ea78d40bbfdc54d7ce603a96232b11f5a405.tar.gz
nextcloud-server-1427ea78d40bbfdc54d7ce603a96232b11f5a405.zip
fix typo and comment
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/lib/connection.php4
-rw-r--r--apps/user_ldap/lib/user/manager.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 1e18a8d4aa7..fa6258445d8 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -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;
diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php
index b5d402f1fac..c8c89374e98 100644
--- a/apps/user_ldap/lib/user/manager.php
+++ b/apps/user_ldap/lib/user/manager.php
@@ -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
*/