mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Now using the "Home" storage detection approach for quota 

To find out whether to apply a quota, we now try and detect whether the
storage to wrap is a "Home" storage.
This commit is contained in:
Vincent Petry 2013-11-21 12:17:47 +01:00
parent 356eef0739
commit 69e8e7dbd5
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/files/storage/home.php
View File

@ -22,6 +22,12 @@ class Home extends Local {
*/
protected $user;
/**
* @brief Construct a Home storage instance
* @param array $arguments array with "user" containing the
* storage owner and "legacy" containing "true" if the storage is
* a legacy storage with "local::" URL instead of the new "home::" one.
*/
public function __construct($arguments) {
$this->user = $arguments['user'];
$datadir = $this->user->getHome();
@ -40,10 +46,21 @@ class Home extends Local {
return $this->id;
}
/**
* @return \OC\Files\Cache\HomeCache
*/
public function getCache($path = '') {
if (!isset($this->cache)) {
$this->cache = new \OC\Files\Cache\HomeCache($this);
}
return $this->cache;
}
/**
* @brief Returns the owner of this home storage
* @return \OC\User\User owner of this home storage
*/
public function getUser() {
return $this->user;
}
}

20
lib/private/util.php
View File

@ -57,21 +57,11 @@ class OC_Util {
// set up quota for home storages, even for other users
// which can happen when using sharing
if (strlen($mountPoint) > 1) {
// the user name will be extracted from the mountpoint
// with the format '/username/' (no suffix)
$user = null;
// find second separator
$nextSepPos = strpos($mountPoint, '/', 1);
// next separator is the last one, format matches
if ($nextSepPos === strlen($mountPoint) - 1) {
$user = substr($mountPoint, 1, $nextSepPos - 1);
}
if ($user) {
$quota = OC_Util::getUserQuota($user);
if ($quota !== \OC\Files\SPACE_UNLIMITED) {
return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota));
}
if ($storage instanceof \OC\Files\Storage\Home) {
$user = $storage->getUser()->getUID();
$quota = OC_Util::getUserQuota($user);
if ($quota !== \OC\Files\SPACE_UNLIMITED) {
return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota));
}
}