Changeset 991

Timestamp:

06/16/09 10:00:28 (15 years ago)

Author:

niltonneto

Message:

Ticket #505 - Correção do jid do contato. Sem dominio quando é de outra OU.

File:

• trunk/jabberit_messenger/inc/class.contacts_im.inc.php (modified) (2 diffs)

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

@@ -69 +69 @@
                 // Hosts Jabber
                 $hostsJabber = unserialize($_SESSION['phpgw_info']['jabberit_messenger']['map_org_realm_jabberit']);
-
-                foreach($hostsJabber as $conf )
-                        if( array_search("*", $conf) )
-                                $hostDefault = $conf['jabberName'];
                         
                 if( is_array($users) )
@@ -82 +78 @@
                                         foreach($hostsJabber as $itens)
                                         {
-                                                if( trim($users[$i]['ou']) === trim($itens['org']) )
-                                                        $users[$i]['jid'] = $users[$i]['jid']."@".$itens['jabberName'];
+                                                if( trim($users[$i]['ou']) === trim($itens['org']) && strpos($users[$i]['jid'],"@") === false)
+                                                                $users[$i]['jid'] = $users[$i]['jid']."@".$itens['jabberName'];                                         
                                                 else
                                                 {
-                                                        if( $users[$i]['ou'] === $ou_User )
-                                                                if(strpos($users[$i]['jid'],"@") === false)
+                                                        if(strpos($users[$i]['jid'],"@") === false)
                                                                         $users[$i]['jid'] = $users[$i]['jid']."@".$this->serverJabber;
-                                                        else
-                                                                if(strpos($users[$i]['jid'],"@") === false)
-                                                                        $users[$i]['jid'] = $users[$i]['jid']."@".$hostDefault;
                                                 }
                                         }