diff options
| author | Joas Schilling <coding@schilljs.com> | 2019-08-21 16:15:23 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2019-11-12 17:13:38 +0100 |
| commit | dcdbea54e60d13d2508b71ebdcb7992f2ae5ef34 (patch) | |
| tree | 4157d8fbbec25f53ab99df3c7e495f8d8862fc36 /lib/private/Share20/DefaultShareProvider.php | |
| parent | 6f8c7885b6263b7e23f0e48c1376b7e67417be2c (diff) | |
| download | nextcloud-server-dcdbea54e60d13d2508b71ebdcb7992f2ae5ef34.tar.gz nextcloud-server-dcdbea54e60d13d2508b71ebdcb7992f2ae5ef34.zip | |
Respect the accepted flag for group and user shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/Share20/DefaultShareProvider.php')
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 05b3094e6a2..61c62364153 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -142,6 +142,7 @@ class DefaultShareProvider implements IShareProvider { if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) { //Set the UID of the user we share with $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith())); + $qb->setValue('accepted', $qb->createNamedParameter(IShare::STATUS_PENDING)); } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) { //Set the GID of the group we share with $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith())); @@ -932,6 +933,7 @@ class DefaultShareProvider implements IShareProvider { ->setTarget($data['file_target']) ->setNote($data['note']) ->setMailSend((bool)$data['mail_send']) + ->setStatus((int)$data['accepted']) ->setLabel($data['label']); $shareTime = new \DateTime(); @@ -1020,6 +1022,7 @@ class DefaultShareProvider implements IShareProvider { while($data = $stmt->fetch()) { $shareMap[$data['parent']]->setPermissions((int)$data['permissions']); + $shareMap[$data['parent']]->setStatus((int)$data['accepted']); $shareMap[$data['parent']]->setTarget($data['file_target']); $shareMap[$data['parent']]->setParent($data['parent']); } |