Changeset 2959 for trunk/jabberit_messenger

Timestamp:

06/18/10 16:57:11 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1113 - Correcao para a busca da foto na janela de chat para Ldaps Externos.

File:

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

trunk/jabberit_messenger/inc/webservice.php

@@ -80 +80 @@
         {
                 if( file_exists('confLDAPExternal.php'))
-                {
+                { 
                         require_once('confLDAPExternal.php');
                         $handle   = unserialize(base64_decode($LDAP_EXTERNAL));
-        
                         foreach($handle as $itens)
                         {
@@ -274 +273 @@
                 }
                 else
-                {                                       
+                {                               
+                        $jabberName = substr($pJid, strpos($pJid, "@") + 1 );
+
+                        if( strpos($jabberName, "/") )
+                                $jabberName = substr($jabberName, 0, strpos($jabberName, "/"));
+
+                        $this->ldapConnectExternal($jabberName);
+
                         if( !$this->fileLdapExternal )
                                 return false;
-                                
-                        $jabberName = substr($pJid, strpos($pJid, "@") + 1 );
-
-                        if( strpos($jabberName, "/") )
-                                $jabberName = substr($jabberName, 0, strpos($jabberName, "/"));
-
-                        $this->ldapConnectExternal($jabberName);
-
+                        
                         if( $this->conn )
                         {
@@ -351 +350 @@
         $jid = $_REQUEST['javaPhoto'];
         $jid = ( strpos($jid, "/") !== false ) ? substr($jid, 0, strpos($jid, "/")) : $jid;
-        
         $photo = $obj->getPhotoLdap( $jid, true );
         $photoWidth = 70;