[Openupload-svn-update] SF.net SVN: openupload:[80] trunk/lib/modules/auth/ldap.inc.php

[<ts...@us...>]

Revision: 80
          http://openupload.svn.sourceforge.net/openupload/?rev=80&view=rev
Author:   tsdogs
Date:     2008-10-24 11:16:14 +0000 (Fri, 24 Oct 2008)

Log Message:
-----------
Fix ldap problems after AD was introduced

Modified Paths:
--------------
    trunk/lib/modules/auth/ldap.inc.php

Modified: trunk/lib/modules/auth/ldap.inc.php
===================================================================
--- trunk/lib/modules/auth/ldap.inc.php	2008-10-24 11:08:04 UTC (rev 79)
+++ trunk/lib/modules/auth/ldap.inc.php	2008-10-24 11:16:14 UTC (rev 80)
@@ -71,46 +71,28 @@
         }
       }
       /* now retrieve the main group */
-      if (is_array($result['group_id'])) {
-        for ($g = 0; $g < $result['group_id']['count']; $g++) {
-          $r = @ldap_search($this->ds, $this->config['groupdn'], 
-               '(&('.$this->gfield.'='.$result['group_id'][$g].')(objectclass='.$this->config['groupclass'].'))');
-          if ($r) {
-            $res = @ldap_get_entries($this->ds, $r);
-            /* associate user fields */
-            $res = $res[0];
-            foreach ($this->config['groupfields'] as $n => $f) {
-              if ($f == 'name' and $res[$n][0]!='') {
-                $result['group'][] = $res[$n][0];
-              }
-            }
-          }
-        }
-      } else {
+      for ($g = 0; $g < $result['group_id']['count']; $g++) {
         $r = @ldap_search($this->ds, $this->config['groupdn'], 
-             '(&('.$this->gfield.'='.$result['group_id'].')(objectclass='.$this->config['groupclass'].'))');
+               '(&('.$this->gfield.'='.$result['group_id'][$g].')(objectclass='.$this->config['groupclass'].'))');
         if ($r) {
           $res = @ldap_get_entries($this->ds, $r);
           /* associate user fields */
-          for ($i = 0; $i<$res['count']; $i++) {
-            $res = $res[0];
-            foreach ($this->config['groupfields'] as $n => $f) {
-              if ($f == 'name' and $res[$n][0]!='') {
-                $result['group'] = $res[$n][0];
-              }
+          $res = $res[0];
+          foreach ($this->config['groupfields'] as $n => $f) {
+            if ($f == 'name' and $res[$n][0]!='') {
+              $result['group'][] = $res[$n][0];
             }
           }
         }
       }
       if (isset($this->config['sgid'])) {
-        $result['group'] = array($result['group']);
         $r = @ldap_search($this->ds, $this->config['groupdn'],
              '(&('.$this->config['sgid'].'='.$result['login'].')(objectclass='.$this->config['groupclass'].'))');
         if ($r) {
           $res = @ldap_get_entries($this->ds, $r);
           for ($i = 0; $i<$res['count']; $i++) {
             foreach ($this->config['sgroupfields'] as $n => $f) {
-              if ($f == 'name' and $res[$n][0]!='') {
+              if ($f == 'name' and $res[$i][$n][0]!='') {
                 $result['group'][] = $res[$i][$n][0];
               }
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.