diff options
| -rw-r--r-- | core/Controller/OCSController.php | 17 | ||||
| -rw-r--r-- | core/routes.php | 1 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 1 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 1 | ||||
| -rw-r--r-- | lib/private/OCS/Config.php | 39 | ||||
| -rw-r--r-- | lib/private/legacy/ocs/config.php | 28 | ||||
| -rw-r--r-- | ocs/routes.php | 8 |
7 files changed, 18 insertions, 77 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'], ], ]); diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index fae1939c41b..7788ee80ee4 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -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', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 1f1d3747cb9..7b7e3ac609d 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -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', diff --git a/lib/private/OCS/Config.php b/lib/private/OCS/Config.php deleted file mode 100644 index a8bf8c325c3..00000000000 --- a/lib/private/OCS/Config.php +++ /dev/null @@ -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); - } - -} diff --git a/lib/private/legacy/ocs/config.php b/lib/private/legacy/ocs/config.php deleted file mode 100644 index dba9a061bb7..00000000000 --- a/lib/private/legacy/ocs/config.php +++ /dev/null @@ -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 { -} diff --git a/ocs/routes.php b/ocs/routes.php index ae2ef05adcd..d14f32e045c 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', |