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

revert changes

This commit is contained in:
Florin Peter 2013-05-17 01:17:55 +02:00
parent 2b0bf4dc87
commit d7dc710c8b
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/public/share.php
View File

@ -1541,34 +1541,31 @@ class Share {
} }
public static function post_addToGroup($arguments) { public static function post_addToGroup($arguments) {
// Find the group shares and check if the user needs a unique target
if(\OC_Config::getValue('installed')) { $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
// Find the group shares and check if the user needs a unique target $result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?'); $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`,'
$result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid'])); .' `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`,'
$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`,' .' `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
.' `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`,' while ($item = $result->fetchRow()) {
.' `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)'); if ($item['item_type'] == 'file' || $item['item_type'] == 'file') {
while ($item = $result->fetchRow()) { $itemTarget = null;
if ($item['item_type'] == 'file' || $item['item_type'] == 'file') { } else {
$itemTarget = null; $itemTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
} else { $arguments['uid'], $item['uid_owner'], $item['item_target'], $item['id']);
$itemTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER, }
$arguments['uid'], $item['uid_owner'], $item['item_target'], $item['id']); if (isset($item['file_source'])) {
} $fileTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
if (isset($item['file_source'])) { $arguments['uid'], $item['uid_owner'], $item['file_target'], $item['id']);
$fileTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER, } else {
$arguments['uid'], $item['uid_owner'], $item['file_target'], $item['id']); $fileTarget = null;
} else { }
$fileTarget = null; // Insert an extra row for the group share if the item or file target is unique for this user
} if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) {
// Insert an extra row for the group share if the item or file target is unique for this user $query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'],
if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) { self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'],
$query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'], $item['stime'], $item['file_source'], $fileTarget));
self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'], \OC_DB::insertid('*PREFIX*share');
$item['stime'], $item['file_source'], $fileTarget));
\OC_DB::insertid('*PREFIX*share');
}
} }
} }
} }