Changeset 5954 for sandbox/webservice/api/json-rpc/Expresso.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/Expresso.php (modified) (3 diffs)

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);
                         }                       
                 }