Changeset 5681

Timestamp:

03/08/12 18:44:26 (11 years ago)

Author:

niltonneto

Message:

Ticket #2507 - Implementada primeira parte do método Catalog.getUserContacts().

Location:

sandbox/webservice/api

Files:

• json-rpc/Catalog.php (modified) (2 diffs)
• json-rpc/Expresso.php (modified) (2 diffs)
• webservice.php (modified) (1 diff)

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

@@ -4 +4 @@
 
 class Catalog extends Expresso {        
-        var $ldap;
-        var $db;
-                    
-        private function getLdap(){
-                if($this->ldap == null) {
-                        
-                }
-                                
-                return $this->ldap;
-        }
-        
-        private function getDb(){
-                if($this->ldap == null) {
-                        
-                }       
-                return $this->db;               
-        }
-        
         
         public function getUserContacts($params){
                 if($this->isLoggedIn($params)) {
+                        $query = 'select A.id_contact, A.alias, A.given_names, A.family_names, A.names_ordered, A.birthdate, A.notes, C.connection_value from phpgw_cc_contact A, '.
+                                        'phpgw_cc_contact_conns B, phpgw_cc_connections C where '.
+                                        'A.id_contact = B.id_contact and B.id_connection = C.id_connection '.
+                                        'and B.id_typeof_contact_connection = 1 and A.id_owner='.$this -> getUserId().' group by '.
+                                        ' A.id_contact, A.alias, A.given_names, A.family_names,A.names_ordered,A.birthdate, A.notes,C.connection_value  order by lower(A.names_ordered)';
                         
+                        if (!$this->getDb()->query($query))
+                                return false;
+                        
+                        $contacts = array();
+                        while($this->getDb()->next_record()) {
+                                $row = $this->getDb()->row();                           
+                                $contacts[] = array(
+                                        'contactID'             => $row['id_contact'],
+                                        'MailAddress'   => $row['connection_value'],
+                                        'AliasName'             => $row['alias'],
+                                        'FirstName'             => $row['given_names'],
+                                        'LastName'              => $row['family_names'],
+                                        'FullName'              => $row['names_ordered'],
+                                        'BirthDate'             => $row['birthdate'],
+                                        'Notes'                 => $row['notes'],
+                                //      'ImagePicture'  => null                         
+                                );
+                                
+                        }
+                        $this->result = array ('contacts' => $contacts);                                
                 }
-                        
-                $this->result = array (
-                        'contacts' => $contacts
-                );
-                        
+
                 return $this->getResponse();
         }       
@@ -38 +41 @@
                 
                 if($this->isLoggedIn($params)) {
-                        
+                        $this->result = array ('contacts' => $contacts);
                 }
-                        
-                $this->result = array (
-                        'contacts' => $contacts
-                );
-                        
                 return $this->getResponse();
         }

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

@@ -4 +4 @@
 
         protected $expressoVersion;
+        protected $ldap;
         var $result;
         var $error;
@@ -24 +25 @@
         }       
                 
+        protected function getUserId(){
+                return $GLOBALS['phpgw_info']['user']['account_id'];
+        }
+        
+        protected function getLdap(){
+                if($this->ldap == null) {
+                        $this->ldap = $GLOBALS['phpgw']->common->ldapConnect();
+                }
+        
+                return $this->ldap;
+        }
+        
+        protected function getDb(){
+                return $GLOBALS['phpgw']->db;
+        }
+        
         
         protected function isLoggedIn($params){

sandbox/webservice/api/webservice.php

@@ -7 +7 @@
         "Expresso.getExpressoVersion",
         "Mail.getUserFolders",
-        "Mail.getUserMessages"
+        "Mail.getUserMessages",
+        "Catalog.getUserContacts",
 );