diff options
| author | Roeland Douma <rullzer@users.noreply.github.com> | 2015-08-10 20:33:50 +0200 |
|---|---|---|
| committer | Roeland Douma <rullzer@users.noreply.github.com> | 2015-08-10 20:33:50 +0200 |
| commit | c2856c05aa9cbdc3adddea127a8588183647ee0a (patch) | |
| tree | ad9f474fb95007345f2e78c3d4e998d0f6f97308 /apps/files_sharing/appinfo | |
| parent | 6e4a79f8529a69b846f73257cc581d2b80f7762d (diff) | |
| parent | f0b617b50825566ec1b417eed09688e88de5f0bb (diff) | |
| download | nextcloud-server-c2856c05aa9cbdc3adddea127a8588183647ee0a.tar.gz nextcloud-server-c2856c05aa9cbdc3adddea127a8588183647ee0a.zip | |
Merge pull request #15093 from rullzer/capabilities_manager
Capabilities manager
Diffstat (limited to 'apps/files_sharing/appinfo')
| -rw-r--r-- | apps/files_sharing/appinfo/application.php | 9 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/routes.php | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php index b9c2844d78c..2fe9019d54e 100644 --- a/apps/files_sharing/appinfo/application.php +++ b/apps/files_sharing/appinfo/application.php @@ -2,6 +2,7 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 @@ -20,7 +21,7 @@ * */ -namespace OCA\Files_Sharing\Appinfo; +namespace OCA\Files_Sharing\AppInfo; use OCA\Files_Sharing\Helper; use OCA\Files_Sharing\MountProvider; @@ -31,6 +32,7 @@ use OCA\Files_Sharing\Controllers\ExternalSharesController; use OCA\Files_Sharing\Controllers\ShareController; use OCA\Files_Sharing\Middleware\SharingCheckMiddleware; use \OCP\IContainer; +use OCA\Files_Sharing\Capabilities; class Application extends App { public function __construct(array $urlParams = array()) { @@ -122,6 +124,11 @@ class Application extends App { $server->getConfig() ); }); + + /* + * Register capabilities + */ + $container->registerCapability('OCA\Files_Sharing\Capabilities'); } public function registerMountProviders() { diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php index 21d21a83441..1e99267a43a 100644 --- a/apps/files_sharing/appinfo/routes.php +++ b/apps/files_sharing/appinfo/routes.php @@ -97,8 +97,3 @@ API::register('delete', array('\OCA\Files_Sharing\API\Remote', 'declineShare'), 'files_sharing'); -// Register with the capabilities API -API::register('get', - '/cloud/capabilities', - array('OCA\Files_Sharing\Capabilities', 'getCapabilities'), - 'files_sharing', API::USER_AUTH); |