Changeset 5954 for sandbox/webservice/api/json-rpc/Catalog.php

Timestamp:

04/16/12 17:34:31 (12 years ago)

Author:

niltonneto

Message:

Ticket #2507 - Corrigido método getUserId(). Renomeado classe http_request.

File:

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

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

@@ -4 +4 @@
 
 class Catalog extends Expresso {        
-        var $userPrefs;
+        var $searchCharactersNumber;
         var $userId;
 
         public function __construct(){
-                $this->userPrefs   = $this->getUserPreferences();
+                $prefs = $GLOBALS['phpgw']->preferences->read();
+                $this-> searchCharactersNumber = $prefs['expressoMail']['search_characters_number'];
         }
         
         private function getUserId(){
                 $userProfile = $this->getUserProfile();
-                return $userProfile['account_id'];
+                return $userProfile['contactID'];
         }
         
@@ -29 +30 @@
                                 }
                                 elseif($params['contactType'] == 2){
-                                        if($this->userPrefs['search_characters_number'] <= strlen($search))
+                                        if($this-> searchCharactersNumber <= 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.");
+                                                $this-> error = Errors::get(Errors::CATALOG_MIN_ARGUMENT_SEARCH);
+                                                $this-> error = str_replace("%1",$this-> searchCharactersNumber,$this->error);
                                                 return $this->getResponse();
                                         }