wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only use one config option 'objectstore' for root and home storage configuration

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2014-06-13 15:49:40 +02:00
parent 7493ff0624
commit 4e65889f54
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -325,14 +325,14 @@ class Filesystem {
$userObject = \OC_User::getManager()->get($user);
if (!is_null($userObject)) {
$homeStorage = \OC_Config::getValue( 'home_storage', array(
$homeStorage = \OC_Config::getValue( 'objectstore', array(
//default home storage configuration:
'class' => '\OC\Files\Storage\Home',
'arguments' => array()
));
// sanity checks
if (empty($homeStorage['class'])) {
\OCP\Util::writeLog('files', 'No class given for home_storage', \OCP\Util::ERROR);
\OCP\Util::writeLog('files', 'No class given for objectstore', \OCP\Util::ERROR);
}
if (!isset($homeStorage['arguments'])) {
$homeStorage['arguments'] = array();

12
lib/private/util.php
View file

@ -73,9 +73,9 @@ class OC_Util {
}
//check if we are using an object storage
$root_storage = OC_Config::getValue( 'root_storage' );
if ( isset( $root_storage ) ) {
self::initObjectStoreRootFS($root_storage);
$objectStore = OC_Config::getValue( 'objectstore' );
if ( isset( $objectStore ) ) {
self::initObjectStoreRootFS($objectStore);
} else {
self::initLocalStorageRootFS();
}
@ -108,10 +108,8 @@ class OC_Util {
return $storage;
});
$userDir = '/'.$user.'/files';
// copy skeleton for local storage only
if ( ! isset( $root_storage ) ) {
if ( ! isset( $objectStore ) ) {
$userRoot = OC_User::getHome($user);
$userDirectory = $userRoot . '/files';
if( !is_dir( $userDirectory )) {
@ -120,6 +118,8 @@ class OC_Util {
}
}
$userDir = '/'.$user.'/files';
//jail the user into his "home" directory
\OC\Files\Filesystem::init($user, $userDir);