Changeset 3263 for branches/2.2/jabberit_messenger/jmessenger/inc/class.ContactsIm.inc.php

Timestamp:

09/17/10 14:39:10 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1316 - Correcoes e melhorias na busca dos contatos para o Modulo IM.

File:

• branches/2.2/jabberit_messenger/jmessenger/inc/class.ContactsIm.inc.php (modified) (3 diffs)

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

@@ -54 +54 @@
                 $users          = $this->getUsersIm($param['name']);
                 
-                if ( !is_array($users) )
-                        return "<error></error>";
-                
                 if( count($users) == 0  )
                         return "<empty></empty>";
                 
-                if( count($users) > $this->ldap->getMaxResults() )
+                if( $users === "manyresults" )
                 {
                         if( isset($_SESSION['phpgw_info']['jabberit_messenger']['photo']) )
@@ -119 +116 @@
         {   
                 $array_uids             = array();
+                $countUids              = 0;
         $members                = array();
         $result                 = array();
         $uidType                = "uid";
                 $serversLdap    = unserialize( trim($_SESSION['phpgw_info']['jabberit_messenger']['groups_search']) );
+                
 
                 if( $serversLdap )
@@ -144 +143 @@
                                 {
                                         $result[$key] = $this->ldap->getUsersLdapRoot("cn=*".$pName."*");
+                                        $countUids += count($result[$key]);
                                 }
                                 else
                                 {
                                         if( !$this->groupsLocked() )
+                                        {
                                                 $result[$key] =  $this->ldap->getUsersLdapCatalog("cn=*".$pName."*", $key );
-                                }
-                        }
-                                
+                                                $countUids += count($result[$key]);
+                                        }
+                                }
+                        }
+                        
+                        if( $countUids >  $this->ldap->getMaxResults() )
+                        {
+                                return "manyresults";
+                        }
+                        
                         $_RESULT = $this->ldap->getMembers($result, $filters);
                         
                         foreach( $_RESULT as $key => $value )
-                                $array_uids = array_merge($array_uids, $_RESULT[$key]); 
+                                $array_uids = array_merge($array_uids, $_RESULT[$key]);
+ 
                 }
                 else