stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-21 04:59:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Throw exceptions as appropriate, but allow the Kohana exception

Browse Source 
handling framework to handle the exception and delegate to our
template, which will JSON encode the response.
This commit is contained in:
Bharat Mediratta
2010-06-19 13:53:22 -07:00
parent 41ca2b0195
commit 456d54ea2d
3 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
modules/rest/controllers/rest.php
View File

@@ -81,41 +81,12 @@ class Rest_Controller extends Controller {
}
$response = call_user_func(array($handler_class, $handler_method), $request);
} catch (Exception $e) {
$response = $this->_format_exception_response($e);
rest::reply($response);
} catch (ORM_Validation_Exception $e) {
// Note: this is totally insufficient because it doesn't take into account localization. We
// either need to map the result values to localized strings in the application code, or every
// client needs its own l10n string set.
throw new Rest_Exception("Bad Request", 400, $e->validation->errors());
}
rest::reply($response);
}
private function _format_exception_response($e) {
// Add this exception to the log
Kohana_Log::add("error", Kohana_Exception::text($e));
$rest_exception = array();
if ($e instanceof ORM_Validation_Exception) {
$detail_response = true;
$rest_exception["code"] = 400;
$rest_exception["message"] = "Validation errors";
$rest_exception["fields"] = $e->validation->errors();
} else if ($e instanceof Rest_Exception) {
$rest_exception["code"] = $e->getCode();
if ($e->getMessage() != "Bad Request") {
$rest_exception["message"] = "Bad Request";
$rest_exception["fields"] = array("type", $e->getMessage());
} else {
$rest_exception["message"] = $e->getMessage();
}
} else {
$rest_exception["code"] = 500;
$rest_exception["message"] = t("Remote server call failed. Please contact the Adminstrator.");
}
if (!headers_sent()) {
header($rest_exception["code"] == 500 ? "HTTP/1.1 500 Internal Server Error" :
"HTTP/1.1 400 Bad Request");
}
return $rest_exception;
}
}

11
modules/rest/libraries/Rest_Exception.php
View File

@@ -18,13 +18,20 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class Rest_Exception_Core extends Kohana_Exception {
public function __construct($message, $code) {
var $response = array();
public function __construct($message, $code, $response) {
parent::__construct($message, null, $code);
$this->response = $response;
}
public function sendHeaders() {
if (!headers_sent()) {
header("HTTP/1.1 " . $this->getCode() . "Bad Request");
header("HTTP/1.1 " . $this->getCode() . " " . $this->getMessage());
}
}
public function getTemplate() {
return "error_rest";
}
}

2
modules/rest/views/error_rest.php Normal file
View File

@@ -0,0 +1,2 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<?= json_encode($e->response) ?>