Merge pull request #14 from wunc/master

Add possibility of 'dn' attribute & fix defaultQueryFields assignment loc
Adldap2 · Apr 20, 2015 · 6cfa70f · 6cfa70f
2 parents 1ed2895 + f443023
commit 6cfa70f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Adldap/Classes/AdldapUsers.php b/src/Adldap/Classes/AdldapUsers.php
@@ -214,6 +214,9 @@ public function info($username, array $fields = array(), $isGUID = false)
 
         $this->adldap->utilities()->validateLdapIsBound();
 
+        // Make sure we assign the default fields if none are given
+        if (count($fields) === 0) $fields = $this->defaultQueryFields;
+
         $personCategory = $this->adldap->getPersonFilter('category');
         $person = $this->adldap->getPersonFilter('person');
 
@@ -222,9 +225,6 @@ public function info($username, array $fields = array(), $isGUID = false)
             ->select($fields)
             ->where($personCategory, '=', $person);
 
-        // Make sure we assign the default fields if none are given
-        if (count($fields) === 0) $fields = $this->defaultQueryFields;
-
         if ($isGUID === true)
         {
             $search->where('objectguid', '=', $username);

diff --git a/src/Adldap/Objects/LdapEntry.php b/src/Adldap/Objects/LdapEntry.php
@@ -70,9 +70,9 @@ public function applyGenericAttributes(array $attributes = array())
         }
 
         // Does the entry contain a distinguished name?
-        if(array_key_exists('distinguishedname', $attributes))
+        if(array_key_exists('dn', $attributes) || array_key_exists('distinguishedname', $attributes))
         {
-            $dn = $attributes['distinguishedname'][0];
+            $dn = (array_key_exists('dn', $attributes)) ? $attributes['dn'] : $attributes['distinguishedname'][0];
 
             // We'll assign the string distinguished name
             $this->setAttribute('dn', $dn);