Changeset 948

Timestamp:

06/04/09 11:40:08 (15 years ago)

Author:

niltonneto

Message:

Ticket #505 - Corrigido erro quando contato está conectado com clienteIM (recurso junto no jid).

File:

• trunk/jabberit_messenger/inc/webservice.php (modified) (4 diffs)

trunk/jabberit_messenger/inc/webservice.php

@@ -141 +141 @@
         {
                 $uid = substr($pJid, 0, strpos($pJid,"@"));
-        
+                
                 if( $this->jabberName == (substr($pJid, strpos($pJid, "@") + 1 )))
                 {
@@ -150 +150 @@
                                 $filter = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
                                 $justthese = array("uid","jpegPhoto");
+                                
                                 $search = ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
                                 $entry1 = ldap_get_entries($this->conn,$search);
@@ -167 +168 @@
                 }
                 else
-                {
+                {                                       
                         $jabberName = substr($pJid, strpos($pJid, "@") + 1 );
                         
                         if( strpos($jabberName, "/") )
                                 $jabberName = substr($jabberName, 0, strpos($jabberName, "/"));
-                        
+
                         $this->ldapConnectExternal($jabberName);
 
@@ -228 +229 @@
         $obj = new webService();
         $jid = $_REQUEST['javaPhoto'];
+        $jid = strpos($jid, "/") ? substr($jid, 0, strpos($jid, "/")) : $jid;
         
         $photo = $obj->getPhotoLdap($jid);