Changeset 3406

Timestamp:

10/22/10 17:02:15 (14 years ago)

Author:

alexandrecorreia

Message:

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

Location:

branches/2.2/jabberit_messenger

Files:

• inc/class.contacts_im.inc.php (modified) (1 diff)
• jmessenger/inc/class.ContactsIm.inc.php (modified) (3 diffs)
• templates/default/enabled_ou_groups.tpl (modified) (1 diff)

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

@@ -188 +188 @@
                 else
                 {
+                // Ldap Root
                 $result[] = $this->ldap->getUsersLdapRoot("cn=*".$pName."*");
+               
+                // Ldap Catalog                 
+                        if( count($this->hostsJabberLdap) )
+                        {
+                                foreach( $this->hostsJabberLdap as $conf )
+                                {
+                                        $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*", $conf['serverLdap'] );
+                                }
+                        }
                
                 foreach( $result as $key => $value )
                 {
-                                $array_uids = array_merge($array_uids, $result[$key]);
+                                $array_uids = array_merge($array_uids, $value);
                 }
                 

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

@@ -119 +119 @@
         $members                = array();
         $result                 = array();
-        $uidType                = "uid";
+        $uidType                = $this->attribute;
                 $serversLdap    = unserialize( trim($_SESSION['phpgw_info']['jabberit_messenger']['groups_search']) );
 
@@ -125 +125 @@
                 {
                         // Usa Grupos Ldap
-                        
                         $filters = array( );
                         
@@ -167 +166 @@
                 else
                 {
+                // Ldap Root
                 $result[] = $this->ldap->getUsersLdapRoot("cn=*".$pName."*");
                
-                foreach( $result as $key => $value )
+                        // Ldap Catalog                 
+                        if( count($this->hostsJabberLdap) )
+                        {
+                                foreach( $this->hostsJabberLdap as $conf )
+                                {
+                                        $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*", $conf['serverLdap'] );
+                                }
+                        }
+
+                foreach( $result as $value )
                 {
-                                $array_uids = array_merge($array_uids, $result[$key]);
+                                $array_uids = array_merge($array_uids, $value );
                 }
-                                
+                        
                         if( count($array_uids) >  $this->ldap->getMaxResults() )
                         {

branches/2.2/jabberit_messenger/templates/default/enabled_ou_groups.tpl

@@ -2 +2 @@
 <script type="text/javascript" src="jabberit_messenger/js/connector.js"></script>
 <script type="text/javascript" src="jabberit_messenger/js/xtools.js"></script>
-<script type="text/javascript" src="jabberit_messenger/controller.php?act=j.glocked"></script>
         <form>
                 <table align="center" width="90%" cellspacing="2" style="border:1px solid #000;margin-top:20px;">