Changeset 3530 for branches/2.2/admin

Timestamp:

11/23/10 15:22:12 (13 years ago)

Author:

brunocosta

Message:

Ticket #1325 - Adapta buscas LDAP para casos que não existem OUs.

File:

• branches/2.2/admin/inc/class.sovoip.inc.php (modified) (4 diffs)

branches/2.2/admin/inc/class.sovoip.inc.php

@@ -46 +46 @@
                 if ( $this->ldap )      
                 {
-                        $filter = "ou=*";
+                        $filter = "objectClass=organizationalUnit";
                         $justthese = array("ou");
                         $search = ldap_list($this->ldap, $this->ldap_context, $filter, $justthese);
@@ -52 +52 @@
                 }
 
-                if( $entry )
+                //$result_ou[] = "";
+
+                if( $entry['count'] > 0 )
                 {
                         foreach($entry as $tmp)
                                 if( $tmp['ou'][0] != "" )
                                         $result_ou[] = $tmp['ou'][0];
+                }else{
+                    $result_ou[] = $this->ldap_context;
                 }
                 
@@ -66 +70 @@
         public final function getGroupsLdap($pOrg)
         {
-                $organization = 'ou=' . $pOrg['ou'] .",". $this->ldap_context;
+                if($pOrg['ou'] == $this->ldap_context)
+                    $organization = $this->ldap_context;
+                else
+                    $organization = 'ou=' . $pOrg['ou'] .",". $this->ldap_context;
                 
                 $this->ldap = $this->common->ldapConnect($this->ldap_host,$this->ldap_root_dn,$this->ldap_root_pw);
@@ -74 +81 @@
                         $filter = "(&(phpgwAccountType=g)(objectClass=posixGroup))";
                         $justthese = array("cn","gidNumber");
-                        $search = ldap_list($this->ldap, $organization, $filter, $justthese);
+                        $search = ldap_search($this->ldap, $organization, $filter, $justthese);
                         $entry = ldap_get_entries( $this->ldap, $search );