wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #865 from nextcloud/ocs_config

Browse source 
Move OCS route /config to proper controller
This commit is contained in:
Morris Jobke 2016-08-19 09:39:05 +02:00 committed by GitHub
commit 3ccd69707e
7 changed files with 18 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/Controller/OCSController.php
View file

@ -52,6 +52,23 @@ class OCSController extends \OCP\AppFramework\OCSController {
$this->userSession = $userSession;
}
/**
* @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

1
core/routes.php
View file

@ -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'],
],
]);

1
lib/composer/composer/autoload_classmap.php
View file

@ -584,7 +584,6 @@ return array(
'OC\\Notification\\Manager' => $baseDir . '/lib/private/Notification/Manager.php',
'OC\\Notification\\Notification' => $baseDir . '/lib/private/Notification/Notification.php',
'OC\\OCSClient' => $baseDir . '/lib/private/OCSClient.php',
'OC\\OCS\\Config' => $baseDir . '/lib/private/OCS/Config.php',
'OC\\OCS\\CoreCapabilities' => $baseDir . '/lib/private/OCS/CoreCapabilities.php',
'OC\\OCS\\Exception' => $baseDir . '/lib/private/OCS/Exception.php',
'OC\\OCS\\Person' => $baseDir . '/lib/private/OCS/Person.php',

1
lib/composer/composer/autoload_static.php
View file

@ -614,7 +614,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Notification\\Manager' => __DIR__ . '/../../..' . '/lib/private/Notification/Manager.php',
'OC\\Notification\\Notification' => __DIR__ . '/../../..' . '/lib/private/Notification/Notification.php',
'OC\\OCSClient' => __DIR__ . '/../../..' . '/lib/private/OCSClient.php',
'OC\\OCS\\Config' => __DIR__ . '/../../..' . '/lib/private/OCS/Config.php',
'OC\\OCS\\CoreCapabilities' => __DIR__ . '/../../..' . '/lib/private/OCS/CoreCapabilities.php',
'OC\\OCS\\Exception' => __DIR__ . '/../../..' . '/lib/private/OCS/Exception.php',
'OC\\OCS\\Person' => __DIR__ . '/../../..' . '/lib/private/OCS/Person.php',

39
lib/private/OCS/Config.php
View file

@ -1,39 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Bart Visscher <bartv@thisnet.nl>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author Tom Needham <tom@owncloud.com>
*
* @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/>
*
*/
namespace OC\OCS;
class Config {
public static function apiConfig() {
$xml['version'] = '1.7';
$xml['website'] = 'ownCloud';
$xml['host'] = \OCP\Util::getServerHost();
$xml['contact'] = '';
$xml['ssl'] = 'false';
return new Result($xml);
}
}

28
lib/private/legacy/ocs/config.php
View file

@ -1,28 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Roeland Jago Douma <roeland@famdouma.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/>
*
*/
/**
* @deprecated Since 9.1.0 use \OC\OCS\Config
*/
class OC_OCS_Config extends \OC\OCS\Config {
}

8
ocs/routes.php
View file

@ -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',