upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #22493 from owncloud/issue_22467

Browse source 
getRootFolder should not setup the FS for any user
This commit is contained in:
Thomas Müller 2016-02-18 16:46:00 +01:00
commit 48f6ae0b2d
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/files/filesystem.php
View file

@ -237,9 +237,9 @@ class Filesystem {
*
* @return \OC\Files\Mount\Manager
*/
public static function getMountManager() {
public static function getMountManager($user = '') {
if (!self::$mounts) {
\OC_Util::setupFS();
\OC_Util::setupFS($user);
}
return self::$mounts;
}

2
lib/private/files/node/root.php
View file

@ -71,7 +71,7 @@ class Root extends Folder implements IRootFolder {
/**
* @param \OC\Files\Mount\Manager $manager
* @param \OC\Files\View $view
* @param \OC\User\User $user
* @param \OC\User\User|null $user
*/
public function __construct($manager, $view, $user) {
parent::__construct($this, $view, '');

12
lib/private/server.php
View file

@ -40,7 +40,6 @@ namespace OC;
use bantu\IniGetWrapper\IniGetWrapper;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Db\Db;
use OC\AppFramework\Utility\SimpleContainer;
use OC\AppFramework\Utility\TimeFactory;
use OC\Command\AsyncBus;
use OC\Diagnostics\EventLogger;
@ -164,15 +163,10 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerService('SystemTagObjectMapper', function (Server $c) {
return $c->query('SystemTagManagerFactory')->getObjectMapper();
});
$this->registerService('RootFolder', function (Server $c) {
// TODO: get user and user manager from container as well
$user = \OC_User::getUser();
/** @var $c SimpleContainer */
$userManager = $c->query('UserManager');
$user = $userManager->get($user);
$manager = \OC\Files\Filesystem::getMountManager();
$this->registerService('RootFolder', function () {
$manager = \OC\Files\Filesystem::getMountManager(null);
$view = new View();
$root = new Root($manager, $view, $user);
$root = new Root($manager, $view, null);
$connector = new HookConnector($root, $view);
$connector->viewToNode();
return $root;

4
lib/private/util.php
View file

@ -128,7 +128,9 @@ class OC_Util {
\OC::$server->getEventLogger()->start('setup_fs', 'Setup filesystem');
// If we are not forced to load a specific user we load the one that is logged in
if ($user == "" && OC_User::isLoggedIn()) {
if ($user === null) {
$user = '';
} else if ($user == "" && OC_User::isLoggedIn()) {
$user = OC_User::getUser();
}