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

Fix group detection for sharing in case username contains '@', fix for oc-1270

Browse source
This commit is contained in:
Michael Gapczynski 2012-07-27 15:34:51 -04:00
parent 48f33be848
commit df9f5b902a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/files_sharing/ajax/getitem.php
View file

@ -22,8 +22,13 @@ while ($path != $userDirectory) {
} }
} else { } else {
// Check if uid_shared_with is a group // Check if uid_shared_with is a group
if (($pos = strpos($uid_shared_with, '@')) !== false) { $pos = strrpos($uid_shared_with, '@');
if ($pos !== false) {
$gid = substr($uid_shared_with, $pos + 1); $gid = substr($uid_shared_with, $pos + 1);
} else {
$gid = false;
}
if ($gid && OC_Group::groupExists($gid)) {
// Include users in the group so the users can be removed from the list of people to share with // Include users in the group so the users can be removed from the list of people to share with
if ($path == $source) { if ($path == $source) {
$group = array(array('gid' => $gid, 'permissions' => $rows[$i]['permissions'], 'users' => OC_Group::usersInGroup($gid), 'parentFolder' => false)); $group = array(array('gid' => $gid, 'permissions' => $rows[$i]['permissions'], 'users' => OC_Group::usersInGroup($gid), 'parentFolder' => false));

2
apps/files_sharing/lib_share.php
View file

@ -179,7 +179,7 @@ class OC_Share {
$uid_shared_with = OC_Group::usersInGroup($uid_shared_with); $uid_shared_with = OC_Group::usersInGroup($uid_shared_with);
// Remove the owner from the list of users in the group // Remove the owner from the list of users in the group
$uid_shared_with = array_diff($uid_shared_with, array(OCP\USER::getUser())); $uid_shared_with = array_diff($uid_shared_with, array(OCP\USER::getUser()));
} else if ($uid = strstr($uid_shared_with, '@', true)) { } else if ($uid = strrchr($uid_shared_with, '@', true)) {
$uid_shared_with = array($uid); $uid_shared_with = array($uid);
} else { } else {
$uid_shared_with = array($uid_shared_with); $uid_shared_with = array($uid_shared_with);