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

use the correct user if we update the share table

Browse source
This commit is contained in:
Bjoern Schiessle 2015-07-03 15:58:52 +02:00
parent 62f07261ea
commit 763b601e4a
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/files_sharing/lib/sharedmount.php
View file

@ -46,12 +46,18 @@ class SharedMount extends MountPoint implements MoveableMount {
*/ */
private $recipientView; private $recipientView;
/**
* @var string
*/
private $user;
public function __construct($storage, $mountpoint, $arguments = null, $loader = null) { public function __construct($storage, $mountpoint, $arguments = null, $loader = null) {
// first update the mount point before creating the parent // first update the mount point before creating the parent
$this->ownerPropagator = $arguments['propagator']; $this->ownerPropagator = $arguments['propagator'];
$this->recipientView = new View('/' . $arguments['user'] . '/files'); $this->user = $arguments['user'];
$this->recipientView = new View('/' . $this->user . '/files');
$newMountPoint = $this->verifyMountPoint($arguments['share']); $newMountPoint = $this->verifyMountPoint($arguments['share']);
$absMountPoint = '/' . $arguments['user'] . '/files' . $newMountPoint; $absMountPoint = '/' . $this->user . '/files' . $newMountPoint;
$arguments['ownerView'] = new View('/' . $arguments['share']['uid_owner'] . '/files'); $arguments['ownerView'] = new View('/' . $arguments['share']['uid_owner'] . '/files');
parent::__construct($storage, $absMountPoint, $arguments, $loader); parent::__construct($storage, $absMountPoint, $arguments, $loader);
} }
@ -90,7 +96,7 @@ class SharedMount extends MountPoint implements MoveableMount {
* @param array $share reference to the share which should be modified * @param array $share reference to the share which should be modified
* @return bool * @return bool
*/ */
private static function updateFileTarget($newPath, &$share) { private function updateFileTarget($newPath, &$share) {
// if the user renames a mount point from a group share we need to create a new db entry // if the user renames a mount point from a group share we need to create a new db entry
// for the unique name // for the unique name
if ($share['share_type'] === \OCP\Share::SHARE_TYPE_GROUP && empty($share['unique_name'])) { if ($share['share_type'] === \OCP\Share::SHARE_TYPE_GROUP && empty($share['unique_name'])) {
@ -98,7 +104,7 @@ class SharedMount extends MountPoint implements MoveableMount {
.' `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,' .' `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
.' `file_target`, `token`, `parent`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)'); .' `file_target`, `token`, `parent`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
$arguments = array($share['item_type'], $share['item_source'], $share['item_target'], $arguments = array($share['item_type'], $share['item_source'], $share['item_target'],
2, \OCP\User::getUser(), $share['uid_owner'], $share['permissions'], $share['stime'], $share['file_source'], 2, $this->user, $share['uid_owner'], $share['permissions'], $share['stime'], $share['file_source'],
$newPath, $share['token'], $share['id']); $newPath, $share['token'], $share['id']);
} else { } else {
// rename mount point // rename mount point