sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New system of unsharing files from self, and a small bug fix when all files inside a shared folder are unshared from self

remotes/origin/stable
Michael Gapczynski 2011-08-17 17:43:15 +07:00
parent 1c13b2681a
commit 5b8658ca10
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/files_sharing/lib_share.php
Unescape Escape View File

@ -199,7 +199,7 @@ class OC_Share {
$folder .= "/";
}
$length = strlen($folder);
$query = OC_DB::prepare("SELECT uid_owner, source, target FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? OR SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
$query = OC_DB::prepare("SELECT uid_owner, source, target, permissions FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? OR SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
return $query->execute(array($length, $folder, $length, $folder))->fetchAll();
}
@ -362,10 +362,15 @@ class OC_Share {
*
* @param $target The target location of the item
*/
public static function unshareFromMySelf($target) {
public static function unshareFromMySelf($target, $delete = true) {
$target = self::cleanPath($target);
$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
$query->execute(array(strlen($target), $target));
if ($delete) {
$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
$query->execute(array(strlen($target), $target));
} else {
$query = OC_DB::prepare("UPDATE *PREFIX*sharing SET permissions = ? WHERE SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
$query->execute(array(-1, strlen($target), $target));
}
}
/**

22
apps/files_sharing/sharedstorage.php
Unescape Escape View File

@ -111,19 +111,22 @@ class OC_Filestorage_Shared extends OC_Filestorage {
$targets = array();
foreach ($modifiedItems as $item) {
// If the item is in the current directory and has a different name than the source, add it to the arrays
if (dirname($item['target']) == $path && basename($item['source']) != basename($item['target'])) {
$sources[] = basename($item['source']);
$targets[] = basename($item['target']);
// If the item was unshared from self, add it it to the arrays
} elseif ($item['target'] == "/") {
$sources[] = basename($item['source']);
$targets[] = "";
if (dirname($item['target']) == $path) {
// If the item was unshared from self, add it it to the arrays
if ($item['permissions'] == -1) {
$sources[] = basename($item['source']);
$targets[] = "";
} else {
$sources[] = basename($item['source']);
$targets[] = basename($item['target']);
}
}
}
// Don't waste time if there aren't any modified items in the current directory
if (empty($sources)) {
return $dh;
} else {
$files = array();
while (($filename = readdir($dh)) !== false) {
if ($filename != "." && $filename != "..") {
// If the file isn't in the sources array it isn't modified and can be added as is
@ -402,9 +405,10 @@ class OC_Filestorage_Shared extends OC_Filestorage {
if (OC_Share::getParentFolders($target)) {
// If entry for item already exists
if (OC_Share::getItem($target)) {
OC_Share::setTarget($target, "/");
OC_Share::unshareFromMySelf($target, false);
} else {
OC_Share::pullOutOfFolder($target, "/");
OC_Share::pullOutOfFolder($target, $target);
OC_Share::unshareFromMySelf($target, false);
}
// Delete the database entry
} else {