Changeset 5954

Timestamp:

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

Author:

niltonneto

Message:

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

Location:

sandbox/webservice/api

Files:

• json-rpc/Catalog.php (modified) (2 diffs)
• json-rpc/Expresso.php (modified) (3 diffs)
• library (added)
• library/Errors.php (added)
• library/HttpRequest.php (moved) (moved from sandbox/webservice/api/http_request.class.php) (2 diffs)
• webservice.php (modified) (3 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();
                                         }

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

@@ -49 +49 @@
         
         protected function isLoggedIn($params){
-                list($sessionid, $kp3) = explode(":", $params['auth']);
-                if($GLOBALS['phpgw']->session->verify($sessionid, $kp3)){                                                                       
-                        return true;
+                if($params['auth'] != null) {
+                        list($sessionid, $kp3) = explode(":", $params['auth']);
+                        if($GLOBALS['phpgw']->session->verify($sessionid, $kp3)){                                                                       
+                                return true;
+                        }
+                        else{
+                                $this-> error = Errors::get(Errors::LOGIN_AUTH_INVALID);
+                                return false;
+                        }
                 }
                 else{
-                        $this-> error = "You are not logged in";
+                        $this-> error = Errors::get(Errors::LOGIN_NOT_LOGGED_IN);
                         return false;
                 }               
@@ -67 +73 @@
                 if(!$this-> isLoggedIn($params)) 
                 {                               
-                        if($params['auth'] != "") 
-                        {       
-                                $this->error  = "Your auth is invalid";
-                                
-                        }
-                        elseif($sessionid = $GLOBALS['phpgw']->session->create($params['user'], $params['password']))                                   
+                        if($sessionid = $GLOBALS['phpgw']->session->create($params['user'], $params['password']))                                       
                         {
                                 $this->error  = null;
@@ -82 +83 @@
                         else
                         {                               
-                                $this-> error = $GLOBALS['phpgw']->session->reason;
+                                $this-> error = Errors::get($GLOBALS['phpgw']->session->cd_reason);
                         }                       
                 }

sandbox/webservice/api/library/HttpRequest.php

@@ -3 +3 @@
 * Access the HTTP Request 
 */  
-class http_request {  
+class HttpRequest {  
   
     /** additional HTTP headers not prefixed with HTTP_ in $_SERVER superglobal */  
@@ -13 +13 @@
     * @param Array Additional Headers to retrieve 
     */  
-    function http_request($add_headers = false) {  
+    function HttpRequest($add_headers = false) {  
       
         $this->retrieve_headers($add_headers);  

sandbox/webservice/api/webservice.php

@@ -1 +1 @@
 <?php
-include_once("http_request.class.php");
 
 $public_functions = array(
@@ -22 +21 @@
 
 include_once('../header.inc.php');
+include_once("./library/HttpRequest.php");
+include_once("./library/Errors.php");
 
 // NO COOKIES!!!!
@@ -38 +39 @@
         if(empty($request)) {
                 $request = array();
-                $http_request = new http_request();
+                $http_request = new HttpRequest();
                 $content_type = $http_request->header('Content-Type');
                 $accept = $http_request->header('Accept');