Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-06-26 13:15:09 +0300
committerMorris Jobke <hey@morrisjobke.de>2018-06-26 17:14:15 +0300
commitb0a296e2e1dd1b173d9cab8c82158ac6bfb86f9e (patch)
treebfcea01e9ff2d5a3cfc7580a5b1c719d68fcdd6a /remote.php
parent79d9841bce94c0e9abf5e53c845236296a8999de (diff)
Do not use HTTP code OC_Response constants anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'remote.php')
-rw-r--r--remote.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/remote.php b/remote.php
index d90bb2d8ee5..11940b025dd 100644
--- a/remote.php
+++ b/remote.php
@@ -59,9 +59,9 @@ function handleException($e) {
$server->on('beforeMethod', function () use ($e) {
if ($e instanceof RemoteException) {
switch ($e->getCode()) {
- case OC_Response::STATUS_SERVICE_UNAVAILABLE:
+ case 503:
throw new ServiceUnavailable($e->getMessage());
- case OC_Response::STATUS_NOT_FOUND:
+ case 404:
throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
}
}
@@ -71,9 +71,9 @@ function handleException($e) {
});
$server->exec();
} else {
- $statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
+ $statusCode = 500;
if ($e instanceof \OC\ServiceUnavailableException ) {
- $statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
+ $statusCode = 503;
}
if ($e instanceof RemoteException) {
// we shall not log on RemoteException
@@ -118,13 +118,13 @@ try {
if (\OCP\Util::needUpgrade()) {
// since the behavior of apps or remotes are unpredictable during
// an upgrade, return a 503 directly
- throw new RemoteException('Service unavailable', OC_Response::STATUS_SERVICE_UNAVAILABLE);
+ throw new RemoteException('Service unavailable', 503);
}
$request = \OC::$server->getRequest();
$pathInfo = $request->getPathInfo();
if ($pathInfo === false || $pathInfo === '') {
- throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
+ throw new RemoteException('Path not found', 404);
}
if (!$pos = strpos($pathInfo, '/', 1)) {
$pos = strlen($pathInfo);
@@ -134,7 +134,7 @@ try {
$file = resolveService($service);
if(is_null($file)) {
- throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
+ throw new RemoteException('Path not found', 404);
}
$file=ltrim($file, '/');