mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude 

Dont create exclude list for generating the share target
This commit is contained in:
Björn Schießle 2015-04-09 14:51:15 +02:00
parent 1d9bd3d31e 2e34db2bb3
commit 0710db77bc
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/private/share/helper.php
View File

@ -50,34 +50,19 @@ class Helper extends \OC\Share\Constants {
}
return $backend->generateTarget($itemSource, false);
} else {
if ($itemType == 'file' || $itemType == 'folder') {
$column = 'file_target';
$columnSource = 'file_source';
} else {
$column = 'item_target';
$columnSource = 'item_source';
}
if ($shareType == self::SHARE_TYPE_USER) {
// Share with is a user, so set share type to user and groups
$shareType = self::$shareTypeUserAndGroups;
}
$exclude = array();
$result = \OCP\Share::getItemsSharedWithUser($itemType, $shareWith);
foreach ($result as $row) {
if ($row['permissions'] > 0) {
$exclude[] = $row[$column];
}
}
// Check if suggested target exists first
if (!isset($suggestedTarget)) {
$suggestedTarget = $itemSource;
}
if ($shareType == self::SHARE_TYPE_GROUP) {
$target = $backend->generateTarget($suggestedTarget, false, $exclude);
$target = $backend->generateTarget($suggestedTarget, false);
} else {
$target = $backend->generateTarget($suggestedTarget, $shareWith, $exclude);
$target = $backend->generateTarget($suggestedTarget, $shareWith);
}
return $target;