Changeset 5712

Timestamp:

03/13/12 11:45:33 (11 years ago)

Author:

niltonneto

Message:

Ticket #2507 - Adicionado em getImagePicture() busca para foto de usuário LDAP.

File:

• sandbox/webservice/api/json-rpc/Catalog.php (modified) (3 diffs)

sandbox/webservice/api/json-rpc/Catalog.php

@@ -69 +69 @@
         
         public function getImagePicture($params){               
-                if($this->isLoggedIn($params) && $params['contactID'] > 0) {                    
-                        $query = 'select A.id_contact, A.photo from phpgw_cc_contact A where A.id_contact='.$params['contactID'].' and A.id_owner='.$this -> getUserId();               
-                        if (!$this->getDb()->query($query))
-                                return false;
-
+                if($this->isLoggedIn($params) && $params['contactID'] != null) {
                         $contact = array();
-                        if($this->getDb()->next_record()) {
-                                $row = $this->getDb()->row();
-                                if($row['photo'] != null) {
-                                        $contact[] = array(
-                                                'contactID'             => $row['id_contact'],
-                                                'contactImagePicture'   => ($row['photo'] != null ? base64_encode($row['photo']) : "")
-                                        );
-                                }                       
+                        // User Contact 
+                        if($params['contactType'] == 1){
+                                $query = 'select A.id_contact, A.photo from phpgw_cc_contact A where A.id_contact='.$params['contactID'].' and A.id_owner='.$this -> getUserId();               
+                                if (!$this->getDb()->query($query))
+                                        return false;
+                                if($this->getDb()->next_record()) {
+                                        $row = $this->getDb()->row();
+                                        if($row['photo'] != null) {
+                                                $contact[] = array(
+                                                        'contactID'             => $row['id_contact'],
+                                                        'contactImagePicture'   => ($row['photo'] != null ? base64_encode($row['photo']) : "")
+                                                );
+                                        }
+                                }
                         }
+                        // Global Catalog                       
+                        elseif($params['contactType'] == 2){
+                                $photo = $this->getUserLdapPhoto($params['contactID']);
+                                $contact[] = array(
+                                                'contactID'             => $params['contactID'],
+                                                'contactImagePicture'   => ($photo != null ? base64_encode($photo[0]) : "")
+                                );
+                                
+                        }                       
                         $this->result = array ('contacts' => $contact);
                 }
@@ -115 +126 @@
                 }
                 return false;
+        }
+        
+        private function getUserLdapPhoto($contactID) {         
+                $ldap_context = $_SESSION['phpgw_info']['expressomail']['ldap_server']['dn'];
+                $justthese = array("dn", 'jpegPhoto','givenName', 'sn');
+                $this->getLdapCatalog()->ldapConnect(true);
+                $ds = $this->getLdapCatalog()->ds;              
+                
+                if ($ds){
+                        $resource = ldap_read($ds, $contactID, "phpgwaccounttype=u");
+                        $n_entries = ldap_count_entries($ds, $resource);
+                        error_log("entrou foto =".$n_entries);
+                        if ( $n_entries == 1) {                 
+                                $first_entry = ldap_first_entry($ds, $resource);
+                                $obj = ldap_get_attributes($ds, $first_entry);
+                                
+                                if($obj['jpegPhoto']){
+                                        return ldap_get_values_len( $ds, $first_entry, "jpegPhoto");
+                                }
+                        }                                                               
+                }
+                return false;
         }       
         
@@ -133 +166 @@
                                 );
                                 // Buscar atributos faltantes. 
-                                $contacts[$i] = array_merge($this->getUserLdapAttrs($result[$i]['mail']), $contacts[$i]);                               
+                                if(is_array($this->getUserLdapAttrs($result[$i]['mail'])))
+                                        $contacts[$i] = array_merge($this->getUserLdapAttrs($result[$i]['mail']), $contacts[$i]);                               
                         }
                 }