Changeset 1911 for trunk/jabberit_messenger

Timestamp:

12/29/09 15:03:07 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #808 - Busca implementada utilizando somente os grupos cadastrados.

Location:

trunk/jabberit_messenger/inc

Files:

• class.contacts_im.inc.php (modified) (3 diffs)
• class.ldap_im.inc.php (modified) (5 diffs)

trunk/jabberit_messenger/inc/class.contacts_im.inc.php

@@ -201 +201 @@
         if( !$this->groupsLocked() )
         {
-                        $array_uids_external = array();
-
                         unset($serversLdap[$this->serverLdap]);
 
@@ -209 +207 @@
                                 foreach( $serversLdap as $key => $tmp )
                                 {
+                                        $array_uids_external = array( );
                                         $groupsExternal = unserialize($tmp);
 
@@ -217 +216 @@
                                                         $group = explode(":",$tmpExt);
                                                         $array_result = $this->ldap->getGroupsMemberUid( $group[0], $key );
-                                                        @array_shift($array_result[0]['memberuid']);
-                                                        $array_uids_external = @array_merge($array_uids_external, $array_result[0]['memberuid']);
-                                                        unset($array_result);
+                                                        
+                                                        if( $array_result[0]['memberuid']['count'] )
+                                                                unset($array_result[0]['memberuid']['count']);
+
+                                                        $array_uids_external = array_merge($array_uids_external, $array_result[0]['memberuid']);
                                                 }
                                                 
-                                                for( $i = 0; $i < count( $array_uids_external ) ; $i+=50 )
-                                        {   
-                                        $partial_uids_external  = array_slice($array_uids_external,$i,50);
-                                        $filter_uid_external    = implode(")(uid=",$partial_uids_external);
-                                        $filter_uid_external    = "(uid=". $filter_uid_external. ")";
-                                        $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*", $filter_uid_external, $key );
-                                        }
-                                        unset($array_uids_external);
-                                        }
-                                        
-                                }
-                        }
-                        
+                                                
+                                                if( is_array($array_uids_external) )
+                                                {
+                                                        for( $i = 0; $i < count( $array_uids_external ) ; $i+=50 )
+                                                {   
+                                                $partial_uids_external  = array_slice($array_uids_external,$i,50);
+                                                $filter_uid_external    = implode(")(uid=",$partial_uids_external);
+                                                $filter_uid_external    = "(uid=". $filter_uid_external. ")";
+                                                $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*", $filter_uid_external, $key );
+                                                }
+                                        }
+                                        }
+                                }
+                        }
+
                         if( count($this->hostsJabberLdap) )
                         {

trunk/jabberit_messenger/inc/class.ldap_im.inc.php

@@ -195 +195 @@
                                         @ldap_close($this->ldap);
                                         
-                                if( $pLdap == $confHosts[$i]['serverLdap'] )
+                                if( trim($pLdap) === trim($confHosts[$i]['serverLdap']) )
                                 {
                                         $this->ldap_host        = $confHosts[$i]['serverLdap'];
@@ -202 +202 @@
                                         $this->ldap_org         = $confHosts[$i]['org'];
                                         $this->ldap_pass        = $confHosts[$i]['password'];
-                                
                                         $this->ldap = $this->ldapCatalog();
                                         
@@ -212 +211 @@
                                                 $result = ldap_get_entries($this->ldap,$search);
                                         }
+                                        
                                 }
                         }
@@ -310 +310 @@
                 for( $i = 0; $i < count($confHosts); $i++ )
                 {
-                        if( $this->ldap )
-                                @ldap_close($this->ldap);
-                        
                         if( $pLdap && $pLdap == $confHosts[$i]['serverLdap'] )
                         {
@@ -321 +318 @@
                                 $this->ldap_pass        = $confHosts[$i]['password'];
                                 $this->ldap             = $this->ldapCatalog();
-                        }
-                        else
-                        {
-                                $this->ldap_host        = $confHosts[$i]['serverLdap'];
-                                $this->ldap_context = $confHosts[$i]['contextLdap'];
-                                $this->ldap_user        = $confHosts[$i]['user'];
-                                $this->ldap_org         = $confHosts[$i]['org'];
-                                $this->ldap_pass        = $confHosts[$i]['password'];
-                                $this->ldap             = $this->ldapCatalog();
-                        }       
-
-                        if( $this->ldap )
-                        {
-                                $filter         = ( $uid ) ? "(&(phpgwaccounttype=u)(|".$uid.")(".$search ."))" : "(&(phpgwaccounttype=u)(".$search ."))";
-                                $justthese      = array( $this->attribute ,"uidNumber" ,"cn" ,"mail" ,"phpgwAccountVisible" ,"dn" ,"jpegPhoto" );                                                               
-                                $searchRoot     = ( $this->ldap_org != "*" ) ? "ou=".$this->ldap_org.",".$this->ldap_context : $this->ldap_context;
-                                $search1        = @ldap_search($this->ldap, $searchRoot, $filter, $justthese, 0, $this->max_result + 1);
-                                $entry1         = @ldap_get_entries( $this->ldap, $search1 );
-                                $result         = $this->resultArray( $entry1, $this->ldap, $this->ldap_org );
-
-                                if( count($return) > 0 )
-                                $return = array_merge($return, $result);
-                                else
-                                        $return = $result;                              
+
+                                if( $this->ldap )
+                                {
+                                        $filter         = ( $uid ) ? "(&(phpgwaccounttype=u)(|".$uid.")(".$search ."))" : "(&(phpgwaccounttype=u)(".$search ."))";
+                                        $justthese      = array( $this->attribute ,"uidNumber" ,"cn" ,"mail" ,"phpgwAccountVisible" ,"dn" ,"jpegPhoto" );                                                               
+                                        $searchRoot     = ( $this->ldap_org != "*" ) ? "ou=".$this->ldap_org.",".$this->ldap_context : $this->ldap_context;
+                                        $search1        = @ldap_search($this->ldap, $searchRoot, $filter, $justthese, 0, $this->max_result + 1);
+                                        $entry1         = @ldap_get_entries( $this->ldap, $search1 );
+                                        $result         = $this->resultArray( $entry1, $this->ldap, $this->ldap_org );
+        
+                                        if( count($return) > 0 )
+                                        $return = array_merge($return, $result);
+                                        else
+                                                $return = $result;                              
+                                }
+                                
+                                if( $this->ldap )
+                                        ldap_close($this->ldap);
                         }
                 }