diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/cache/storage.php | 15 | ||||
| -rw-r--r-- | lib/private/files/filesystem.php | 8 | ||||
| -rw-r--r-- | lib/private/files/storage/home.php | 31 |
3 files changed, 52 insertions, 2 deletions
diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php index 8a9e47ca36d..5657cf06e12 100644 --- a/lib/private/files/cache/storage.php +++ b/lib/private/files/cache/storage.php @@ -48,7 +48,7 @@ class Storage { } public static function getStorageId($numericId) { - + $sql = 'SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?'; $result = \OC_DB::executeAudited($sql, array($numericId)); if ($row = $result->fetchRow()) { @@ -57,4 +57,17 @@ class Storage { return null; } } + + public static function exists($storageId) { + if (strlen($storageId) > 64) { + $storageId = md5($storageId); + } + $sql = 'SELECT `numeric_id` FROM `*PREFIX*storages` WHERE `id` = ?'; + $result = \OC_DB::executeAudited($sql, array($storageId)); + if ($row = $result->fetchRow()) { + return true; + } else { + return false; + } + } } diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 10ec5c41d11..e40502bbe64 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -305,7 +305,13 @@ class Filesystem { $parser = new \OC\ArrayParser(); $root = \OC_User::getHome($user); - self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); + + $userObject = \OC_User::getManager()->get($user); + if (\OC\Files\Cache\Storage::exists('local::' . $root . '/') or is_null($userObject)) { + self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); + } else { + self::mount('\OC\Files\Storage\Home', array('user' => $userObject), $user); + } $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); //move config file to it's new position diff --git a/lib/private/files/storage/home.php b/lib/private/files/storage/home.php new file mode 100644 index 00000000000..47a76c1b840 --- /dev/null +++ b/lib/private/files/storage/home.php @@ -0,0 +1,31 @@ +<?php +/** + * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Files\Storage; + +/** + * Specialized version of Local storage for home directory usage + */ +class Home extends Local { + /** + * @var \OC\User\User $user + */ + protected $user; + + public function __construct($arguments) { + $this->user = $arguments['user']; + $this->datadir = $this->user->getHome(); + if (substr($this->datadir, -1) !== '/') { + $this->datadir .= '/'; + } + } + + public function getId() { + return 'home::' . $this->user->getUID(); + } +} |