Changeset 5889

Timestamp:

04/05/12 17:22:21 (12 years ago)

Author:

niltonneto

Message:

Ticket #2507 - Implementado métodos getUserProfile() e getUserPreferences().

Location:

sandbox/webservice/api/json-rpc

Files:

• Catalog.php (modified) (2 diffs)
• Expresso.php (modified) (2 diffs)

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

@@ -4 +4 @@
 
 class Catalog extends Expresso {        
+        var $userPrefs;
+        var $userId;
+
+        public function __construct(){
+                $this->userPrefs   = $this->getUserPreferences();
+        }
+        
+        private function getUserId(){
+                $userProfile = $this->getUserProfile();
+                return $userProfile['account_id'];
+        }
         
         public function getUserContacts($params){
@@ -9 +20 @@
                         $search = "";
                         if($params) {
-                                
                                 $search = trim($params['search']);
-                                if($params['contactID'] > 0){
-                                        $query_contact = 'A.id_contact='.$params['contactID'].' and';
-                                }
-                                elseif($search != "") {
+                                if($search != "") {
                                         $search = mb_convert_encoding($search,"ISO_8859-1", "UTF8");
                                 }
                                 
-                                if(($search || $params['contactID']) && $params['contactType'] == 2){
-                                        return $this->getGlobalContacts($search, $params['contactID']);                                 
+                                if($params['contactID'] > 0 && $params['contactType'] == 1){
+                                        $query_contact = 'A.id_contact='.$params['contactID'].' and';
+                                }
+                                elseif($params['contactType'] == 2){
+                                        if($this->userPrefs['search_characters_number'] <= strlen($search))
+                                                return $this->getGlobalContacts($search, $params['contactID']);
+                                        else{
+                                                $this-> error = str_replace("%1",$this->userPrefs['search_characters_number'],"Your search argument must be longer than %1 characters.");
+                                                return $this->getResponse();
+                                        }
                                 }
                         }

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

@@ -25 +25 @@
         }       
                 
-        protected function getUserId(){
-                return $GLOBALS['phpgw_info']['user']['account_id'];
+        protected function getUserProfile(){
+                return array(
+                        'account_id'            => $GLOBALS['phpgw_info']['user']['account_id'],
+                        'email'                         => $GLOBALS['phpgw_info']['user']['email'],
+                        'telephonenumber'       => $GLOBALS['phpgw_info']['user']['telephonenumber'],
+                        'fullname'                      => $GLOBALS['phpgw_info']['user']['fullname']
+                );
+        }
+
+        protected function getUserPreferences(){
+                $prefs = $GLOBALS['phpgw']->preferences->read();
+                return array(
+                                "search_characters_number"  => $prefs['expressoMail']['search_characters_number'],
+                                "search_result_number"          => $prefs['expressoMail']['search_result_number'],
+                                "save_deleted_msg"                      => $prefs['expressoMail']['save_deleted_msg'],
+                                "max_email_per_page"            => $prefs['expressoMail']['max_email_per_page'],
+                                "delete_trash_messages_after_n_days" => $prefs['expressoMail']['delete_trash_messages_after_n_days'],
+                                "save_in_folder"                        => $prefs['expressoMail']['save_in_folder']
+                                );
         }
         
@@ -71 +88 @@
                         {
                                 $this->error  = null;
-                                $this->result = array('auth' =>  $sessionid.":".$GLOBALS['phpgw']->session->kp3);
+                                $this->result = array(
+                                                'auth'                  => $sessionid.":".$GLOBALS['phpgw']->session->kp3,
+                                                'profile'               => $this->getUserProfile(),
+                                                'preferences'   => $this->getUserPreferences()
+                                        );
                         }
                         else