summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-12-08 13:02:57 +0100
committerVincent Petry <pvince81@owncloud.com>2015-12-09 15:58:42 +0100
commitaf705643353d6991eff7ba6ad32056b99b9a7f3e (patch)
treec8daeec598aa9d4559d9f6418ae9a46d33f6ba13 /lib
parent2466972efd8be02bb5efbb46057671c916fe7401 (diff)
downloadnextcloud-server-af705643353d6991eff7ba6ad32056b99b9a7f3e.tar.gz
nextcloud-server-af705643353d6991eff7ba6ad32056b99b9a7f3e.zip
Add reshare permission checks
Added in isSharable() in incoming remote share. Added in isSharable() in regular incoming share. Added in FileInfo to make sure the proper attributes are returned to the clients.
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/fileinfo.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index b097c3a77ea..a4a424c88ba 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -174,7 +174,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
*/
public function getPermissions() {
$perms = $this->data['permissions'];
- if (\OCP\Util::isSharingDisabledForUser()) {
+ if (\OCP\Util::isSharingDisabledForUser() || ($this->isShared() && !\OC\Share\Share::isResharingAllowed())) {
$perms = $perms & ~\OCP\Constants::PERMISSION_SHARE;
}
return $perms;