From 6174a514b76f2e1c32c6fce6de6a23cfac414558 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 3 Mar 2017 00:41:21 -0600
Subject: [PATCH] Get rid of static OCS::notFound()

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 lib/private/legacy/ocs.php | 43 --------------------------------------
 ocs/v1.php                 | 12 +++++++++--
 2 files changed, 10 insertions(+), 45 deletions(-)
 delete mode 100644 lib/private/legacy/ocs.php

diff --git a/lib/private/legacy/ocs.php b/lib/private/legacy/ocs.php
deleted file mode 100644
index a03cba7bc1..0000000000
--- a/lib/private/legacy/ocs.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Frank Karlitschek <frank@karlitschek.de>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-use OCP\API;
-
-/**
- * Class to handle open collaboration services API requests
- */
-class OC_OCS {
-	/**
-	 * Called when a not existing OCS endpoint has been called
-	 */
-	public static function notFound() {
-		$format = \OC::$server->getRequest()->getParam('format', 'xml');
-		$txt='Invalid query, please check the syntax. API specifications are here:'
-			.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
-		OC_API::respond(new OC_OCS_Result(null, API::RESPOND_NOT_FOUND, $txt), $format);
-	}
-
-}
diff --git a/ocs/v1.php b/ocs/v1.php
index 2c83144da6..e92250b7e3 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -80,7 +80,11 @@ try {
 	OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
 } catch (ResourceNotFoundException $e) {
 	OC_API::setContentType();
-	OC_OCS::notFound();
+
+	$format = \OC::$server->getRequest()->getParam('format', 'xml');
+	$txt='Invalid query, please check the syntax. API specifications are here:'
+		.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
+	OC_API::respond(new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 } catch (MethodNotAllowedException $e) {
 	OC_API::setContentType();
 	OC_Response::setStatus(405);
@@ -91,6 +95,10 @@ try {
 } catch (\Exception $e) {
 	\OC::$server->getLogger()->logException($e);
 	OC_API::setContentType();
-	OC_OCS::notFound();
+
+	$format = \OC::$server->getRequest()->getParam('format', 'xml');
+	$txt='Invalid query, please check the syntax. API specifications are here:'
+		.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
+	OC_API::respond(new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 }