fix merge
This commit is contained in:
parent
45784f213f
commit
dd9601ae8f
|
@ -8,15 +8,88 @@
|
|||
|
||||
namespace OCA\Files_Sharing\Appinfo;
|
||||
|
||||
use OCA\Files_Sharing\Helper;
|
||||
use OCA\Files_Sharing\MountProvider;
|
||||
use OCA\Files_Sharing\Propagation\PropagationManager;
|
||||
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;
|
||||
|
||||
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) {
|
||||
return new ShareController(
|
||||
$c->query('AppName'),
|
||||
$c->query('Request'),
|
||||
$c->query('UserSession'),
|
||||
$server->getAppConfig(),
|
||||
$server->getConfig(),
|
||||
$c->query('URLGenerator'),
|
||||
$c->query('UserManager'),
|
||||
$server->getLogger(),
|
||||
$server->getActivityManager()
|
||||
);
|
||||
});
|
||||
$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
|
||||
return new ExternalSharesController(
|
||||
$c->query('AppName'),
|
||||
$c->query('Request'),
|
||||
$c->query('IsIncomingShareEnabled'),
|
||||
$c->query('ExternalManager')
|
||||
);
|
||||
});
|
||||
|
||||
/**
|
||||
* Core class wrappers
|
||||
*/
|
||||
$container->registerService('UserSession', function (SimpleContainer $c) use ($server) {
|
||||
return $server->getUserSession();
|
||||
});
|
||||
$container->registerService('URLGenerator', function (SimpleContainer $c) use ($server) {
|
||||
return $server->getUrlGenerator();
|
||||
});
|
||||
$container->registerService('UserManager', function (SimpleContainer $c) use ($server) {
|
||||
return $server->getUserManager();
|
||||
});
|
||||
$container->registerService('IsIncomingShareEnabled', function (SimpleContainer $c) {
|
||||
return Helper::isIncomingServer2serverShareEnabled();
|
||||
});
|
||||
$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
|
||||
$user = $server->getUserSession()->getUser();
|
||||
$uid = $user ? $user->getUID() : null;
|
||||
return new \OCA\Files_Sharing\External\Manager(
|
||||
$server->getDatabaseConnection(),
|
||||
\OC\Files\Filesystem::getMountManager(),
|
||||
\OC\Files\Filesystem::getLoader(),
|
||||
$server->getHTTPHelper(),
|
||||
$uid
|
||||
);
|
||||
});
|
||||
|
||||
/**
|
||||
* Middleware
|
||||
*/
|
||||
$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
|
||||
return new SharingCheckMiddleware(
|
||||
$c->query('AppName'),
|
||||
$server->getConfig(),
|
||||
$server->getAppManager()
|
||||
);
|
||||
});
|
||||
|
||||
// Execute middlewares
|
||||
$container->registerMiddleware('SharingCheckMiddleware');
|
||||
|
||||
$container->registerService('MountProvider', function (IContainer $c) {
|
||||
/** @var \OCP\IServerContainer $server */
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
*/
|
||||
namespace OCA\Files_Sharing\AppInfo;
|
||||
|
||||
use OCP\API;
|
||||
|
||||
$application = new Application();
|
||||
$application->registerRoutes($this, [
|
||||
'resources' => [
|
||||
|
|
|
@ -1,115 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Björn Schießle <schiessle@owncloud.com>
|
||||
* @author Lukas Reschke <lukas@owncloud.com>
|
||||
* @author Morris Jobke <hey@morrisjobke.de>
|
||||
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, 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;
|
||||
|
||||
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\AppFramework\App;
|
||||
|
||||
/**
|
||||
* @package OCA\Files_Sharing
|
||||
*/
|
||||
class Application extends App {
|
||||
|
||||
|
||||
/**
|
||||
* @param array $urlParams
|
||||
*/
|
||||
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) {
|
||||
return new ShareController(
|
||||
$c->query('AppName'),
|
||||
$c->query('Request'),
|
||||
$c->query('UserSession'),
|
||||
$server->getAppConfig(),
|
||||
$server->getConfig(),
|
||||
$c->query('URLGenerator'),
|
||||
$c->query('UserManager'),
|
||||
$server->getLogger(),
|
||||
$server->getActivityManager()
|
||||
);
|
||||
});
|
||||
$container->registerService('ExternalSharesController', function(SimpleContainer $c) {
|
||||
return new ExternalSharesController(
|
||||
$c->query('AppName'),
|
||||
$c->query('Request'),
|
||||
$c->query('IsIncomingShareEnabled'),
|
||||
$c->query('ExternalManager')
|
||||
);
|
||||
});
|
||||
|
||||
/**
|
||||
* Core class wrappers
|
||||
*/
|
||||
$container->registerService('UserSession', function(SimpleContainer $c) use ($server) {
|
||||
return $server->getUserSession();
|
||||
});
|
||||
$container->registerService('URLGenerator', function(SimpleContainer $c) use ($server){
|
||||
return $server->getUrlGenerator();
|
||||
});
|
||||
$container->registerService('UserManager', function(SimpleContainer $c) use ($server){
|
||||
return $server->getUserManager();
|
||||
});
|
||||
$container->registerService('IsIncomingShareEnabled', function(SimpleContainer $c) {
|
||||
return Helper::isIncomingServer2serverShareEnabled();
|
||||
});
|
||||
$container->registerService('ExternalManager', function(SimpleContainer $c) use ($server){
|
||||
$user = $server->getUserSession()->getUser();
|
||||
$uid = $user ? $user->getUID() : null;
|
||||
return new \OCA\Files_Sharing\External\Manager(
|
||||
$server->getDatabaseConnection(),
|
||||
\OC\Files\Filesystem::getMountManager(),
|
||||
\OC\Files\Filesystem::getLoader(),
|
||||
$server->getHTTPHelper(),
|
||||
$uid
|
||||
);
|
||||
});
|
||||
|
||||
/**
|
||||
* Middleware
|
||||
*/
|
||||
$container->registerService('SharingCheckMiddleware', function(SimpleContainer $c) use ($server){
|
||||
return new SharingCheckMiddleware(
|
||||
$c->query('AppName'),
|
||||
$server->getConfig(),
|
||||
$server->getAppManager()
|
||||
);
|
||||
});
|
||||
|
||||
// Execute middlewares
|
||||
$container->registerMiddleware('SharingCheckMiddleware');
|
||||
}
|
||||
|
||||
}
|
|
@ -26,7 +26,7 @@
|
|||
namespace OCA\Files_Sharing\Controllers;
|
||||
|
||||
use OC\Files\Filesystem;
|
||||
use OCA\Files_Sharing\Application;
|
||||
use OCA\Files_Sharing\AppInfo\Application;
|
||||
use OCP\AppFramework\Http\NotFoundResponse;
|
||||
use OCP\AppFramework\IAppContainer;
|
||||
use OCP\Files;
|
||||
|
|
Loading…
Reference in New Issue