Changeset 6165 for sandbox/webservice/api/rest

Timestamp:

05/11/12 10:38:02 (12 years ago)

Author:

niltonneto

Message:

Ticket #2507 - Refatorado e centralizado tratamento de Erros.

Location:

sandbox/webservice/api/rest

Files:

• catalog/ContactsResource.php (modified) (1 diff)
• core/LoginResource.php (modified) (1 diff)
• dispatch.php (modified) (2 diffs)
• mail/AddFolderResource.php (modified) (2 diffs)
• mail/CleanTrashResource.php (modified) (1 diff)
• mail/DelFolderResource.php (modified) (2 diffs)
• mail/MessagesResource.php (added)
• mail/RenameFolderResource.php (modified) (2 diffs)
• mail/SendSupportFeedbackResource.php (modified) (1 diff)

sandbox/webservice/api/rest/catalog/ContactsResource.php

@@ -24 +24 @@
                                                 return $this->getGlobalContacts($search, $this->getParam('contactID'));
                                         else{
-                                                $error = Errors::get(Errors::CATALOG_MIN_ARGUMENT_SEARCH, $this-> getMinArgumentSearch());                                              
-                                                throw new ResponseException($error['message'], $error['code']);
+                                                Errors::runException("CATALOG_MIN_ARGUMENT_SEARCH", $this-> getMinArgumentSearch());
                                         }
                                 }

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

@@ -35 +35 @@
                 else
                 {
-                        throw new ResponseException("",$GLOBALS['phpgw']->session->cd_reason);
+                        Errors::runException($GLOBALS['phpgw']->session->cd_reason);
                 }
                 return $this->getResponse();

sandbox/webservice/api/rest/dispatch.php

@@ -2 +2 @@
 
 // load libraries
-require_once __DIR__.'/../library/tonic/lib/tonic.php'; 
-require_once(__DIR__."/../Errors.php");
+require_once(__DIR__.'/../library/tonic/lib/tonic.php'); 
+require_once(__DIR__.'/../library/utils/Errors.php');
 
 // load adapters
@@ -54 +54 @@
                         break;
                 default:
-                        $response = Errors::getResponse($request, $e);
+                        
+                        $response = new Response($request);
+                        $response->code = Response::OK;
+                        $response->addHeader('content-type', 'application/json');
+                        if($request->id)
+                                $body['id']     = $request->id;
+                        
+                        $body['error'] = array("code" => "".$e->getCode(), "message" => $e->getMessage());
+                        $response->body = json_encode($body);
         }
 }

sandbox/webservice/api/rest/mail/AddFolderResource.php

@@ -13 +13 @@
 
                         if(empty($new_name) || preg_match('/[\/\\\!\@\#\$\%\&\*\(\)]/', $new_name))
-                                throw new ResponseException("",Errors::MAIL_INVALID_NEW_FOLDER_NAME);
+                                Errors::runException("MAIL_INVALID_NEW_FOLDER_NAME");
 
                         $new_id = $parent_id . $this->getImap()->imap_delimiter . $new_name;
@@ -21 +21 @@
                         $result = $this->getImap()->create_mailbox($params);
                         if($result != 'Ok')
-                                throw new ResponseException("",Errors::MAIL_FOLDER_NOT_ADDED);
+                                Errors::runException("MAIL_FOLDER_NOT_ADDED");
                 }
 

sandbox/webservice/api/rest/mail/CleanTrashResource.php

@@ -10 +10 @@
                         $params['clean_folder'] = 'imapDefaultTrashFolder';
                         if(!$this -> getImap() -> empty_folder($params))
-                                throw new ResponseException("",Errors::MAIL_TRASH_NOT_CLEANED);
+                                Errors::runException("MAIL_TRASH_NOT_CLEANED");
                 }
 

sandbox/webservice/api/rest/mail/DelFolderResource.php

@@ -11 +11 @@
 
                         if(!$this->getImap()->folder_exists($folder_id))
-                                throw new ResponseException("",Errors::MAIL_INVALID_FOLDER);
+                                Errors::runException("MAIL_INVALID_FOLDER");
 
                         $default_folders = array_keys($this->defaultFolders);
                         if(in_array($folder_id, $default_folders))
-                                throw new ResponseException("",Errors::MAIL_CANNOT_DEL_DEFAULT_FOLDER);
+                                Errors::runException("MAIL_CANNOT_DEL_DEFAULT_FOLDER");
 
                         $personal_folders = $this->getImap()->get_folders_list(array('noSharedFolders' => true, 'folderType' => 'personal'));
@@ -23 +23 @@
                         foreach($personal_folders AS $personal_folder){
                                 if($personal_folder['folder_id'] == $folder_id && $personal_folder['folder_hasChildren'])
-                                        throw new ResponseException("",Errors::MAIL_FOLDER_NOT_EMPTY);
+                                        Errors::runException("MAIL_FOLDER_NOT_EMPTY");
                         }
 
                         if($this->getImap()->get_num_msgs(array('folder' => $folder_id)) > 0)
-                                throw new ResponseException("",Errors::MAIL_FOLDER_NOT_EMPTY);
+                                Errors::runException("MAIL_FOLDER_NOT_EMPTY");
 
                         $result = $this->getImap()->delete_mailbox($params);
                         if($result != 'Ok')
-                                throw new ResponseException("",Errors::MAIL_FOLDER_NOT_DELETED);
+                                Errors::runException("MAIL_FOLDER_NOT_DELETED");
                 }
 

sandbox/webservice/api/rest/mail/RenameFolderResource.php

@@ -12 +12 @@
 
                         if(!$this->getImap()->folder_exists($old_id))
-                                throw new ResponseException("",Errors::MAIL_INVALID_OLD_FOLDER);
+                                Errors::runException("MAIL_INVALID_OLD_FOLDER");
 
                         $default_folders = array_keys($this->defaultFolders);
                         if(in_array($old_id, $default_folders))
-                                throw new ResponseException("",Errors::MAIL_INVALID_OLD_FOLDER);
+                                Errors::runException("MAIL_INVALID_OLD_FOLDER");
 
                         if(empty($new_name) || preg_match('/[\/\\\!\@\#\$\%\&\*\(\)]/', $new_name))
-                                throw new ResponseException("",Errors::MAIL_INVALID_NEW_FOLDER_NAME);
+                                Errors::runException("MAIL_INVALID_NEW_FOLDER_NAME");
 
                         $old_id_arr = explode($this->getImap()->imap_delimiter, $old_id);
@@ -30 +30 @@
                         $result = $this->getImap()->ren_mailbox($params);
                         if($result != 'Ok')
-                                throw new ResponseException("",Errors::MAIL_FOLDER_NOT_RENAMED);
+                                Errors::runException("MAIL_FOLDER_NOT_RENAMED");
                 }
 

sandbox/webservice/api/rest/mail/SendSupportFeedbackResource.php

@@ -29 +29 @@
 
                         if (!$returncode || !(is_array($returncode) && $returncode['success'] == true))
-                                throw new ResponseException("",Errors::MAIL_NOT_SENT);
+                                Errors::runException("MAIL_NOT_SENT");
                 }