Skip to content
Snippets Groups Projects
Commit 102120f1 authored by Björn Schießle's avatar Björn Schießle
Browse files

skip update if the recipient is the same user as the owner, otherwise we run...

skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares
parent 5924d1d9
Branches
No related tags found
No related merge requests found
...@@ -38,11 +38,13 @@ class Shared_Updater { ...@@ -38,11 +38,13 @@ class Shared_Updater {
while (!empty($users)) { while (!empty($users)) {
$reshareUsers = array(); $reshareUsers = array();
foreach ($users as $user) { foreach ($users as $user) {
if ( $user !== $uidOwner ) {
$etag = \OC\Files\Filesystem::getETag(''); $etag = \OC\Files\Filesystem::getETag('');
\OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag);
// Look for reshares // Look for reshares
$reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $info['fileid'], $user, true)); $reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $info['fileid'], $user, true));
} }
}
$users = $reshareUsers; $users = $reshareUsers;
} }
// Correct folders of shared file owner // Correct folders of shared file owner
...@@ -88,11 +90,13 @@ class Shared_Updater { ...@@ -88,11 +90,13 @@ class Shared_Updater {
while (!empty($users)) { while (!empty($users)) {
$reshareUsers = array(); $reshareUsers = array();
foreach ($users as $user) { foreach ($users as $user) {
if ($user !== $uidOwner) {
$etag = \OC\Files\Filesystem::getETag(''); $etag = \OC\Files\Filesystem::getETag('');
\OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag);
// Look for reshares // Look for reshares
$reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $params['fileSource'], $user, true)); $reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $params['fileSource'], $user, true));
} }
}
$users = $reshareUsers; $users = $reshareUsers;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment