Changeset 68 for trunk/instant_messenger/inc

Timestamp:

09/14/07 17:43:09 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/instant_messenger/inc

Files:

• class.Ujabber.inc.php (modified) (2 diffs)
• class.contacts_im.inc.php (modified) (1 diff)
• class.ldap_im.inc.php (modified) (1 diff)

trunk/instant_messenger/inc/class.Ujabber.inc.php

@@ -434 +434 @@
    }
    
-   function requireVcard()
-   {
-
+   function Vcard()
+   {
       $contacts = array();
       $contacts = $_SESSION['phpgw_info']['instant_messenger']['contacts'];
-      $jid_user = $_SESSION['phpgw_info']['instant_messenger']['user'];
-      $jid_user .= "@" . $_SESSION['phpgw_info']['instant_messenger']['name_jabber'];
-      
+      $jid_user = $this->getJid();
+
       if( count($contacts) > 0 )
       {
@@ -454 +452 @@
    }
    
+   function VcardUser()
+   {
+        $_SESSION['phpgw_info']['instant_messenger']['socket']['out']['vcard'][] = $this->getJid();;
+   }
+   
    function getJid()
    {

trunk/instant_messenger/inc/class.contacts_im.inc.php

@@ -29 +29 @@
                 foreach($db_acls as $tmp)
                         $search_groups .= "(gidNumber=".$tmp['acl_account'].")";
-
+ 
                 // Busca Grupos
                 $groups = $this->ldap->list_groups_ldap($search_groups);
                                 
+                $search_uids = "|";
                 if($groups)
                 {
-                        $search_uids = "|";
-                        foreach($groups as $tmp){
+                        foreach($groups as $tmp)
+                        {
                                 $members = $tmp['members'];     
                                 foreach($members as $mb)                
                                         $search_uids .= "(uid=".$mb.")";                        
                         }
-                        
-                        $uids_members = $this->ldap->list_users_ldap($search_uids);
-                        
-                        foreach($uids_members as $tmp)
-                                $uids[] = $tmp;
                 }
+                
+                if($uids)
+                {
+                        foreach($uids as $tmp)  
+                                $search_uids .= "(uid=".$tmp['uid'].")";
+                }
+                $uids_members = $this->ldap->list_users_ldap($search_uids);     
                                         
-                if(count($uids) > 0)
-                        return $uids;
+                if(count($uids_members) > 0)
+                        return $uids_members;
                 else
                         return 0; 
-                
         }
                 

trunk/instant_messenger/inc/class.ldap_im.inc.php

@@ -78 +78 @@
         function list_users_ldap($search)
         {
-                
+
                 if($this->conn){
                         $filter = "(&(".$search.")(phpgwAccountType=u))";