Changeset 986

Timestamp:

06/12/09 16:25:20 (15 years ago)

Author:

alexandrecorreia

Message:

Ticket #505 - Arquivos modificados para a administração de hosts virtuais no servidor Jabber.

File:

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

trunk/jabberit_messenger/inc/webservice.php

@@ -141 +141 @@
         }
         
-        public final function getPhotoLdap($pJid)
+        public final function getPhotoLdap( $pJid, $pCatalog )
         {
                 if ( ! $this->jabberName )
@@ -148 +148 @@
                 $uid = substr($pJid, 0, strpos($pJid,"@"));
                 
-                if( $this->jabberName == (substr($pJid, strpos($pJid, "@") + 1 )))
+                if( ($this->jabberName == (substr($pJid, strpos($pJid, "@") + 1 ))) && $pCatalog)
                 {
                         $this->ldapConnect();
@@ -237 +237 @@
         $jid = strpos($jid, "/") ? substr($jid, 0, strpos($jid, "/")) : $jid;
         
-        $photo = $obj->getPhotoLdap($jid);
+        $photo = $obj->getPhotoLdap($jid, true);
         $photoWidth = 70;
         $photoHeight = 90;
@@ -249 +249 @@
         else
         {
-                $photo = @imagecreatefrompng("../templates/default/images/photo.png");
-                imagecopyresized($newImage,$photo,0,0,0,0,$photoWidth,$photoHeight,imagesx($photo),imagesy($photo));
+                $photo = $obj->getPhotoLdap($jid, false);
+                if( $photo )
+                {
+                        $photo = imagecreatefromstring($photo);
+                        imagecopyresized($newImage,$photo,0,0,0,0,$photoWidth,$photoHeight,imagesx($photo),imagesy($photo));
+                }
+                else
+                {
+                        $photo = @imagecreatefrompng("../templates/default/images/photo.png");
+                        imagecopyresized($newImage,$photo,0,0,0,0,$photoWidth,$photoHeight,imagesx($photo),imagesy($photo));
+                }
         }