Changeset 3530 for branches/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php

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/expressoMail1_2/inc/class.ldap_functions.inc.php (modified) (2 diffs)

branches/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -405 +405 @@
                         $info = ldap_get_entries($this->ds, $sr);
 
+                        if($info["count"] == 0)
+                        {
+                            $organizations[0]['ou'] = $this->ldap_context;
+                        }
+
                         for ($i=0; $i<$info["count"]; $i++)
                                 $organizations[$i] = $info[$i]["ou"][0];
@@ -420 +425 @@
                 $this->ldapRootConnect($referral);
                 if ($this->ds) {
-                        $filter="(&(ou=*)(!(phpgwAccountVisible=-1)))";
+                        $filter="(&(objectClass=organizationalUnit)(!(phpgwAccountVisible=-1)))";
                         $justthese = array("ou");
                         $sr = ldap_list($this->ds, $this->ldap_context, $filter, $justthese);
                         $info = ldap_get_entries($this->ds, $sr);
 
-                        for ($i=0; $i<$info["count"]; $i++)
-                        {
-                                $organizations[$i]['ou'] = $info[$i]["ou"][0];
-                                $organizations[$i]['dn'] = $info[$i]["dn"];
-                        }
-
+
+                        if($info["count"] == 0)
+                        {
+                            $organizations[0]['ou'] = $this->ldap_context;
+                            $organizations[0]['dn'] = $this->ldap_context;
+                        }
+                        else{
+                            for ($i=0; $i<$info["count"]; $i++)
+                            {
+                                    $organizations[$i]['ou'] = $info[$i]["ou"][0];
+                                    $organizations[$i]['dn'] = $info[$i]["dn"];
+                            }
+                        }
                         ldap_close($this->ds);
                         sort($organizations);