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

Refactor getUserAndGroups() for new user group sharing standard - user@group

This commit is contained in:
Michael Gapczynski 2011-08-14 12:16:14 -04:00
parent e1473cfe83
commit 5cb687d168
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/files_sharing/lib_share.php
View File

@ -105,9 +105,13 @@ class OC_Share {
*/ */
private static function getUserAndGroups() { private static function getUserAndGroups() {
$self = OC_User::getUser(); $self = OC_User::getUser();
$in = " IN('".$self."'";
$groups = OC_Group::getUserGroups($self); $groups = OC_Group::getUserGroups($self);
array_unshift($groups, $self); foreach ($groups as $group) {
return $groups; $in .= ", '".$self."@".$group."'";
}
$in .= ")";
return $in;
} }
/** /**
@ -171,9 +175,8 @@ class OC_Share {
$folder .= "/"; $folder .= "/";
} }
$length = strlen($folder); $length = strlen($folder);
$userAndGroups = self::getUserAndGroups(); $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::getUserAndGroups()." ");
$query = OC_DB::prepare("SELECT uid_owner, source, target FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? OR SUBSTR(target, 1, ?) = ? AND uid_shared_with IN(".substr(str_repeat(",?", count($userAndGroups)), 1).")"); return $query->execute(array($length, $folder, $length, $folder))->fetchAll();
return $query->execute(array_merge(array($length, $folder, $length, $folder), $userAndGroups))->fetchAll();
} }
/** /**
@ -183,14 +186,13 @@ class OC_Share {
*/ */
public static function getParentFolders($target) { public static function getParentFolders($target) {
$target = self::cleanPath($target); $target = self::cleanPath($target);
$userAndGroups = self::getUserAndGroups(); $query = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with".self::getUserAndGroups()." LIMIT 1");
$query = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with IN(".substr(str_repeat(",?", count($userAndGroups)), 1).") LIMIT 1");
// Prevent searching for user directory e.g. '/MTGap/files' // Prevent searching for user directory e.g. '/MTGap/files'
$userDirectory = substr($target, 0, strpos($target, "files") + 5); $userDirectory = substr($target, 0, strpos($target, "files") + 5);
while ($target != "" && $target != "/" && $target != "." && $target != $userDirectory) { while ($target != "" && $target != "/" && $target != "." && $target != $userDirectory) {
// Check if the parent directory of this target location is shared // Check if the parent directory of this target location is shared
$target = dirname($target); $target = dirname($target);
$result = $query->execute(array_merge(array($target), $userAndGroups))->fetchAll(); $result = $query->execute(array($target))->fetchAll();
if (count($result) > 0) { if (count($result) > 0) {
break; break;
} }
@ -210,9 +212,8 @@ class OC_Share {
*/ */
public static function getSource($target) { public static function getSource($target) {
$target = self::cleanPath($target); $target = self::cleanPath($target);
$userAndGroups = self::getUserAndGroups(); $query = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with ".self::getUserAndGroups()." LIMIT 1");
$query = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with IN(".substr(str_repeat(",?", count($userAndGroups)), 1).") LIMIT 1"); $result = $query->execute(array($target))->fetchAll();
$result = $query->execute(array_merge(array($target), $userAndGroups))->fetchAll();
if (count($result) > 0) { if (count($result) > 0) {
return $result[0]['source']; return $result[0]['source'];
} else { } else {
@ -232,15 +233,14 @@ class OC_Share {
*/ */
public static function getPermissions($target) { public static function getPermissions($target) {
$target = self::cleanPath($target); $target = self::cleanPath($target);
$userAndGroups = self::getUserAndGroups(); $query = OC_DB::prepare("SELECT permissions FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with ".self::getUserAndGroups()." LIMIT 1");
$query = OC_DB::prepare("SELECT permissions FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with IN(".substr(str_repeat(",?", count($userAndGroups)), 1).") LIMIT 1"); $result = $query->execute(array($target))->fetchAll();
$result = $query->execute(array_merge(array($target), $userAndGroups))->fetchAll();
if (count($result) > 0) { if (count($result) > 0) {
return $result[0]['permissions']; return $result[0]['permissions'];
} else { } else {
$folders =self::getParentFolders($target); $folders =self::getParentFolders($target);
if ($folders == true) { if ($folders == true) {
$result = $query->execute(array_merge(array($folders), $userAndGroups))->fetchAll(); $result = $query->execute(array($folders))->fetchAll();
if (count($result) > 0) { if (count($result) > 0) {
return $result[0]['permissions']; return $result[0]['permissions'];
} }