summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-08-19 09:39:05 +0200
committerGitHub <noreply@github.com>2016-08-19 09:39:05 +0200
commit3ccd69707e75c3d99156c41d8107621e07a01ded (patch)
tree5125019b43b28df034e791c3606aef282bce4aca /core
parentae36731604e4b22901f6207b30e419dec28dd3f5 (diff)
parentc7b4142fee63fd83820faff8182c4578da7bcdc6 (diff)
downloadnextcloud-server-3ccd69707e75c3d99156c41d8107621e07a01ded.tar.gz
nextcloud-server-3ccd69707e75c3d99156c41d8107621e07a01ded.zip
Merge pull request #865 from nextcloud/ocs_config
Move OCS route /config to proper controller
Diffstat (limited to 'core')
-rw-r--r--core/Controller/OCSController.php17
-rw-r--r--core/routes.php1
2 files changed, 18 insertions, 0 deletions
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index 8eee52096c2..c785f1ff94a 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -53,6 +53,23 @@ class OCSController extends \OCP\AppFramework\OCSController {
}
/**
+ * @PublicPage
+ *
+ * @return DataResponse
+ */
+ public function getConfig() {
+ $data = [
+ 'version' => '1.7',
+ 'website' => 'Nextcloud',
+ '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 037aa4307b3..3eec1e58c33 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'],
],
]);