diff options
Diffstat (limited to 'apps/files_sharing/appinfo')
| -rw-r--r-- | apps/files_sharing/appinfo/app.php | 4 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/application.php | 145 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/info.xml | 6 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/routes.php | 3 |
4 files changed, 6 insertions, 152 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 32eee9b6c9c..e96269d1148 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -26,15 +26,13 @@ * */ -namespace OCA\Files_Sharing\Appinfo; - $l = \OC::$server->getL10N('files_sharing'); \OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php'; \OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php'; \OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php'; -$application = new Application(); +$application = new \OCA\Files_Sharing\AppInfo\Application(); $application->registerMountProviders(); \OCA\Files_Sharing\Helper::registerHooks(); diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php deleted file mode 100644 index b17e213e2e2..00000000000 --- a/apps/files_sharing/appinfo/application.php +++ /dev/null @@ -1,145 +0,0 @@ -<?php -/** - * @author Joas Schilling <nickvergessen@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> - * @author Robin Appelman <icewind@owncloud.com> - * @author Roeland Jago Douma <rullzer@owncloud.com> - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @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 OCA\Files_Sharing\AppInfo; - -use OCA\FederatedFileSharing\DiscoveryManager; -use OCA\Files_Sharing\MountProvider; -use OCP\AppFramework\App; -use OC\AppFramework\Utility\SimpleContainer; -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()) { - parent::__construct('files_sharing', $urlParams); - - $container = $this->getContainer(); - $server = $container->getServer(); - - /** - * Controllers - */ - $container->registerService('ShareController', function (SimpleContainer $c) use ($server) { - $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing'); - return new ShareController( - $c->query('AppName'), - $c->query('Request'), - $server->getConfig(), - $server->getURLGenerator(), - $server->getUserManager(), - $server->getLogger(), - $server->getActivityManager(), - $server->getShareManager(), - $server->getSession(), - $server->getPreviewManager(), - $server->getRootFolder(), - $federatedSharingApp->getFederatedShareProvider() - ); - }); - $container->registerService('ExternalSharesController', function (SimpleContainer $c) { - return new ExternalSharesController( - $c->query('AppName'), - $c->query('Request'), - $c->query('ExternalManager'), - $c->query('HttpClientService') - ); - }); - - /** - * Core class wrappers - */ - $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) { - return $server->getHTTPClientService(); - }); - $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) { - $user = $server->getUserSession()->getUser(); - $uid = $user ? $user->getUID() : null; - $discoveryManager = new DiscoveryManager( - \OC::$server->getMemCacheFactory(), - \OC::$server->getHTTPClientService() - ); - return new \OCA\Files_Sharing\External\Manager( - $server->getDatabaseConnection(), - \OC\Files\Filesystem::getMountManager(), - \OC\Files\Filesystem::getLoader(), - $server->getHTTPHelper(), - $server->getNotificationManager(), - $discoveryManager, - $uid - ); - }); - - /** - * Middleware - */ - $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) { - return new SharingCheckMiddleware( - $c->query('AppName'), - $server->getConfig(), - $server->getAppManager(), - $c['ControllerMethodReflector'] - ); - }); - - // Execute middlewares - $container->registerMiddleware('SharingCheckMiddleware'); - - $container->registerService('MountProvider', function (IContainer $c) { - /** @var \OCP\IServerContainer $server */ - $server = $c->query('ServerContainer'); - return new MountProvider( - $server->getConfig(), - $server->getShareManager() - ); - }); - - $container->registerService('ExternalMountProvider', function (IContainer $c) { - /** @var \OCP\IServerContainer $server */ - $server = $c->query('ServerContainer'); - return new \OCA\Files_Sharing\External\MountProvider( - $server->getDatabaseConnection(), - function() use ($c) { - return $c->query('ExternalManager'); - } - ); - }); - - /* - * Register capabilities - */ - $container->registerCapability('OCA\Files_Sharing\Capabilities'); - } - - public function registerMountProviders() { - /** @var \OCP\IServerContainer $server */ - $server = $this->getContainer()->query('ServerContainer'); - $mountProviderCollection = $server->getMountProviderCollection(); - $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider')); - $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider')); - } -} diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index 7e49e267275..c1f98aa94ac 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -21,8 +21,10 @@ Turning the feature off removes shared files and folders on the server for all s <files>public.php</files> </public> + <namespace>Files_Sharing</namespace> + <background-jobs> - <job>OCA\Files_sharing\Lib\DeleteOrphanedSharesJob</job> - <job>OCA\Files_sharing\ExpireSharesJob</job> + <job>OCA\Files_Sharing\DeleteOrphanedSharesJob</job> + <job>OCA\Files_Sharing\ExpireSharesJob</job> </background-jobs> </info> diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php index 80632f0fedf..2e11e0e62bc 100644 --- a/apps/files_sharing/appinfo/routes.php +++ b/apps/files_sharing/appinfo/routes.php @@ -24,11 +24,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -namespace OCA\Files_Sharing\AppInfo; use OCP\API; -$application = new Application(); +$application = new \OCA\Files_Sharing\AppInfo\Application(); $application->registerRoutes($this, [ 'resources' => [ 'ExternalShares' => ['url' => '/api/externalShares'], |