Changeset 6061 for sandbox/webservice/api/rest/core/Expresso.php

Timestamp:

04/27/12 15:18:00 (12 years ago)

Author:

niltonneto

Message:

Ticket #2507 - Modificada implementação para tratamento de erros por Exception.

File:

• sandbox/webservice/api/rest/core/Expresso.php (modified) (3 diffs)

sandbox/webservice/api/rest/core/Expresso.php

@@ -59 +59 @@
         }
         
-        public function setError($errorID, $arg1 = false) {
-                if($errorID)
-                        $this-> error = Errors::get($errorID, $arg1);
-                else
-                        $this-> error = null;
+        public function setError($error) {
+                $this-> error = $error;
         }
         
@@ -96 +93 @@
                 $response->addHeader('content-type', 'application/json');
 
+                if($this->getId())
+                        $body['id']     = $this->getId();
+                if($this->getResult())
+                        $body['result'] = $this->getResult();
+                else
+                        throw new ResponseException("",Errors::E_UNKNOWN_ERROR);
                 
-                if($this->getResult()) {
-                        $body['result'] = $this->getResult();
-                }
-                elseif($this->getError()){
-                        $body['error'] = $this->getError();
-                }
-                else{
-                        $this->setError(Errors::E_INTERNAL_ERROR);
-                        $body['error'] = $this->getError();
-                }
-                
-                if($this->getId()) {
-                        $body['id']     = $this->getId();
-                }
-
                 $response->body = json_encode($body);
                 
@@ -143 +131 @@
                         list($sessionid, $kp3) = explode(":", $this->getParam('auth'));
                         if($GLOBALS['phpgw']->session->verify($sessionid, $kp3)){                                                                       
-                                return true;
+                                return $sessionid;
                         }
                         else{
-                                $this-> setError(Errors::LOGIN_AUTH_INVALID);
-                                return false;
+                                throw new ResponseException("",Errors::LOGIN_AUTH_INVALID);
                         }
                 }
                 else{
-                        $this-> setError(Errors::LOGIN_NOT_LOGGED_IN);
-                        return false;
+                        throw new ResponseException("",Errors::LOGIN_NOT_LOGGED_IN);
                 }               
         }