upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 22:27:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

use variable

Browse source
This commit is contained in:
Bjoern Schiessle 2014-03-03 17:24:31 +01:00
parent 3a459db358
commit 078fafdc5a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/private/share/share.php
View file

@ -973,13 +973,13 @@ class Share extends \OC\Share\Constants {
$where .= ' AND `share_type` != ?';
$queryArgs[] = self::$shareTypeGroupUserUnique;
}
if ($itemType == 'file' || $itemType == 'folder') {
if ($fileDependent) {
$column = 'file_source';
} else {
$column = 'item_source';
}
} else {
if ($itemType == 'file' || $itemType == 'folder') {
if ($fileDependent) {
$column = 'file_target';
} else {
$column = 'item_target';
@ -994,7 +994,7 @@ class Share extends \OC\Share\Constants {
// If looking for own shared items, check item_source else check item_target
if (isset($uidOwner) || $itemShareWithBySource) {
// If item type is a file, file source needs to be checked in case the item was converted
if ($itemType == 'file' || $itemType == 'folder') {
if ($fileDependent) {
$where .= ' `file_source` = ?';
$column = 'file_source';
} else {
@ -1002,7 +1002,7 @@ class Share extends \OC\Share\Constants {
$column = 'item_source';
}
} else {
if ($itemType == 'file' || $itemType == 'folder') {
if ($fileDependent) {
$where .= ' `file_target` = ?';
$item = \OC\Files\Filesystem::normalizePath($item);
} else {
@ -1225,7 +1225,7 @@ class Share extends \OC\Share\Constants {
} else if (!isset($statuses[$item[$column]])) {
$statuses[$item[$column]]['link'] = false;
}
if ($itemType == 'file' || $itemType == 'folder') {
if ($fileDependent) {
$statuses[$item[$column]]['path'] = $item['path'];
}
}
@ -1296,7 +1296,6 @@ class Share extends \OC\Share\Constants {
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
}
$parent = null;
if ($backend instanceof \OCP\Share_Backend_File_Dependent) {
$filePath = $backend->getFilePath($itemSource, $uidOwner);
if ($itemType == 'file' || $itemType == 'folder') {