From 743addd1e317c760e8b1e4ad7dc149476e4ad282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 12 Mar 2014 00:35:19 +0100
Subject: [PATCH] set content-type on ocs exceptions
---
lib/private/api.php | 33 ++++++++++++++++++++++++++++++---
ocs/v1.php | 3 +++
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/lib/private/api.php b/lib/private/api.php
index 1537cc11dd0..ccaccda97be 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -116,9 +116,7 @@ class OC_API {
);
}
$response = self::mergeResponses($responses);
- $formats = array('json', 'xml');
-
- $format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml';
+ $format = self::requestedFormat();
if (self::$logoutRequired) {
OC_User::logout();
}
@@ -350,4 +348,33 @@ class OC_API {
}
}
+ /**
+ * @return string
+ */
+ public static function requestedFormat() {
+ $formats = array('json', 'xml');
+
+ $format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml';
+ return $format;
+ }
+
+ /**
+ * Based on the requested format the response content type is set
+ */
+ public static function setOcsContentType() {
+ $format = \OC_API::requestedFormat();
+ if ($format === 'xml') {
+ header('Content-type: text/xml; charset=UTF-8');
+ return;
+ }
+
+ if ($format === 'json') {
+ header('Content-Type: application/json; charset=utf-8');
+ return;
+ }
+
+ header('Content-Type: application/octet-stream; charset=utf-8');
+ }
+
+
}
diff --git a/ocs/v1.php b/ocs/v1.php
index 1c7d1c89768..9d84f482ef7 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -28,8 +28,11 @@ use Symfony\Component\Routing\Exception\MethodNotAllowedException;
try {
OC::getRouter()->match('/ocs'.OC_Request::getRawPathInfo());
} catch (ResourceNotFoundException $e) {
+ OC_API::setContentType();
OC_OCS::notFound();
} catch (MethodNotAllowedException $e) {
+ setOcsContentType();
+ OC_API::setContentType();
OC_Response::setStatus(405);
}
--
GitLab