Changeset 3530 for branches/2.2/jabberit_messenger

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.

Location:

branches/2.2/jabberit_messenger

Files:

• inc/class.contacts_im.inc.php (modified) (1 diff)
• inc/class.ldap_im.inc.php (modified) (2 diffs)
• jmessenger/inc/class.LdapIM.inc.php (modified) (1 diff)

branches/2.2/jabberit_messenger/inc/class.contacts_im.inc.php

@@ -119 +119 @@
                         foreach($users as $tmp)
                         {
-                                if ( !array_key_exists($tmp['ou'], $order) )
+                            if ( !array_key_exists($tmp['ou'], $order) )
                                         $order[$tmp['ou']] = array();
 

branches/2.2/jabberit_messenger/inc/class.ldap_im.inc.php

@@ -340 +340 @@
                 if( $this->ldap )
                 {
-                        $filter = "(ou=*)";
+                        $filter = "(objectClass=organizationalUnit)";
                         $justthese = array("dn");
                         $search = ldap_search($this->ldap, $this->ldap_context, $filter, $justthese);
@@ -464 +464 @@
                                 $result[$j]['uid']                      = $entry[$i][$this->attribute][0];
                                 $result[$j]['jid']                      = $entry[$i][$this->attribute][0];
-                                
-                                $ou = explode("dc=", $entry[$i]['dn']);
-                                $ou = explode("ou=",$ou[0]);
-                                $ou = array_pop($ou);
-                                $result[$j]['ou']       = strtoupper(substr($ou,0,strlen($ou)-1));
+
+                                if(!strpos($entry[$i]['dn'],"ou=") === FALSE){
+                                    $ou = explode("dc=", $entry[$i]['dn']);
+                                    $ou = explode("ou=",$ou[0]);
+                                    $ou = array_pop($ou);
+                                    $result[$j]['ou']   = strtoupper(substr($ou,0,strlen($ou)-1));
+                                }else{
+                                    $ou = explode("dc=", $entry[$i]['dn']);
+                                    $result[$j]['ou'] = strtoupper(substr($ou[1],0,strlen($ou[1])-1));
+                                }
                                 
                                 if( $pOrg === "*" )

branches/2.2/jabberit_messenger/jmessenger/inc/class.LdapIM.inc.php

@@ -339 +339 @@
                 if( $this->ldap )
                 {
-                        $filter = "(ou=*)";
+                        $filter = "(objectClass=organizationalUnit)";
                         $justthese = array("dn");
                         $search = ldap_search($this->ldap, $this->ldap_context, $filter, $justthese);