From 6bc1c6590cf0c0a470d220539f33d1aa4237115d Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sun, 14 Aug 2016 20:46:33 +0200
Subject: [PATCH] Move /config over to Core OCSController

---
 core/Controller/OCSController.php | 17 +++++++++++++++++
 core/routes.php                   |  1 +
 ocs/routes.php                    |  8 --------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index 8eee52096c..05d2a34bac 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -52,6 +52,23 @@ class OCSController extends \OCP\AppFramework\OCSController {
 		$this->userSession = $userSession;
 	}
 
+	/**
+	 * @PublicPage
+	 *
+	 * @return DataResponse
+	 */
+	public function getConfig() {
+		$data = [
+			'version' => '1.7',
+			'website' => 'ownCloud',
+			'host' => $this->request->getServerHost(),
+			'contact' => '',
+			'ssl' => 'false',
+		];
+
+		return new DataResponse($data);
+	}
+
 	/**
 	 * @NoAdminRequired
 	 * @return DataResponse
diff --git a/core/routes.php b/core/routes.php
index b4868c14cf..90b8b4d2ac 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -56,6 +56,7 @@ $application->registerRoutes($this, [
 	'ocs' => [
 		['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
 		['root' => '/cloud', 'name' => 'OCS#getCurrentUser', 'url' => '/user', 'verb' => 'GET'],
+		['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
 	],
 ]);
 
diff --git a/ocs/routes.php b/ocs/routes.php
index ae2ef05adc..d14f32e045 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -29,14 +29,6 @@
 
 use OCP\API;
 
-// Config
-API::register(
-	'get',
-	'/config',
-	array('OC_OCS_Config', 'apiConfig'),
-	'core',
-	API::GUEST_AUTH
-	);
 // Person
 API::register(
 	'post',