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

merge all possible conflicts into on array

Browse source
This commit is contained in:
Björn Schießle 2012-10-02 13:09:34 +02:00
parent 3fdebaa5dc
commit 3e3038cafc
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/public/share.php
View file

@ -1002,22 +1002,21 @@ class Share {
}
}
// Check if target already exists
$targetConflict = false;
$checkTarget = array();
if( $itemType == "file" or $itemType == "folder") {
$itemList1 = self::getItems("file", $target, $shareType, $shareWith);
$itemList2 = self::getItems("folder", $target, $shareType, $shareWith);
if ( !empty($itemList1) or !empty($itemList2)) {
$targetConflict = true;
if ( !empty($itemList1) ) {
$checkTarget = array_merge($checkTarget, $itemList1);
}
if ( !empty($itemList2) ) {
$checkTarget = array_merge($checkTarget, $itemList2);
}
} else {
$itemList = self::getItems($itemType, $target, $shareType, $shareWith);
if ( !empty($itemList) ) {
$targetConflict = true;
}
$checkTarget = self::getItems($itemType, $target, $shareType, $shareWith);
}
if ($targetConflict) {
if ( !empty($checkTarget) ) {
foreach ($checkTarget as $item) {
// Skip item if it is the group parent row
if (isset($groupParent) && $item['id'] == $groupParent) {