]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix typo and comment
authorMorris Jobke <hey@morrisjobke.de>
Thu, 2 Apr 2015 13:05:37 +0000 (15:05 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Fri, 10 Apr 2015 07:12:37 +0000 (09:12 +0200)
apps/user_ldap/lib/connection.php
apps/user_ldap/lib/user/manager.php

index 1e18a8d4aa7ea234d9b647a3d5b5533aa7ce8e89..fa6258445d883292ebeecf5feb90a080f775e4fc 100644 (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;
index b5d402f1fac557dc8fbaa0dea3808ac4e7a5513a..c8c89374e98d205aa52f5df255f272e61a61d786 100644 (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
         */