[Pkg-owncloud-commits] [owncloud] 100/215: fix merge
David Prévot
taffit at moszumanska.debian.org
Tue May 5 01:01:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit dd9601ae8fd0f50eb87d2ce3eed6c5f845573987
Author: Robin Appelman <icewind at owncloud.com>
Date: Mon Apr 20 16:59:20 2015 +0200
fix merge
---
apps/files_sharing/appinfo/application.php | 73 +++++++++++++
apps/files_sharing/appinfo/routes.php | 2 +
apps/files_sharing/application.php | 115 ---------------------
.../tests/controller/sharecontroller.php | 2 +-
4 files changed, 76 insertions(+), 116 deletions(-)
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index 6848c9e..0eb2094 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -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 */
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index db4566e..78fa138 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -25,6 +25,8 @@
*/
namespace OCA\Files_Sharing\AppInfo;
+use OCP\API;
+
$application = new Application();
$application->registerRoutes($this, [
'resources' => [
diff --git a/apps/files_sharing/application.php b/apps/files_sharing/application.php
deleted file mode 100644
index 62c07ff..0000000
--- a/apps/files_sharing/application.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle at owncloud.com>
- * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
- * @author Thomas Müller <thomas.mueller at 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');
- }
-
-}
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
index c3bd41b..64ee5b8 100644
--- a/apps/files_sharing/tests/controller/sharecontroller.php
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -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;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list