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

Save mountpoints relative to the user

Browse source
This commit is contained in:
Robin Appelman 2014-06-04 17:20:00 +02:00 committed by Bjoern Schiessle
parent 43c56fcd07
commit 64ced76beb
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/files_sharing/lib/external/manager.php vendored
View file

@ -8,6 +8,7 @@
namespace OCA\Files_Sharing\External;
use OC\Files\Filesystem;
use OC\Files\Mount\Mount;
class Manager {
@ -52,7 +53,7 @@ class Manager {
if ($user) {
$query = $this->connection->prepare('INSERT INTO *PREFIX*share_external(`remote`, `share_token`, `password`,
`name`, `owner`, `user`, `mountpoint`, `mountpoint_hash`) VALUES(?, ?, ?, ?, ?, ?, ?, ?)');
$mountPoint = '/' . $user->getUID() . '/files/' . $name;
$mountPoint = Filesystem::normalizePath('/' . $name);
$hash = md5($mountPoint);
$query->execute(array($remote, $token, $password, $name, $owner, $user->getUID(), $mountPoint, $hash));
@ -63,9 +64,7 @@ class Manager {
'mountpoint' => $mountPoint,
'owner' => $owner
);
$mount = new Mount(self::STORAGE, $mountPoint, $options, $this->storageLoader);
$this->mountManager->addMount($mount);
return $mount;
return $this->mountShare($options);
}
}
@ -79,12 +78,22 @@ class Manager {
while ($row = $query->fetch()) {
$row['manager'] = $this;
$row['token'] = $row['share_token'];
$mount = new Mount(self::STORAGE, $row['mountpoint'], $row, $this->storageLoader);
$this->mountManager->addMount($mount);
$this->mountShare($row);
}
}
}
/**
* @param array $data
* @return Mount
*/
protected function mountShare($data) {
$mountPoint = '/' . $this->userSession->getUser()->getUID() . '/files' . $data['mountpoint'];
$mount = new Mount(self::STORAGE, $mountPoint, $data, $this->storageLoader);
$this->mountManager->addMount($mount);
return $mount;
}
/**
* @return \OC\Files\Mount\Manager
*/