holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no need to add group-members as additional proxys, ACL grants to groups are understood by WebDAV ACL (tested with iCal)

Browse Source
This commit is contained in:
Ralf Becker 2011-11-02 14:03:36 +00:00
parent 69288160ae
commit f993bf1051
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpgwapi/inc/class.groupdav_principals.inc.php
View File

@ -1001,7 +1001,7 @@ class groupdav_principals extends groupdav_handler
* @param string $str * @param string $str
* @return string * @return string
*/ */
protected function to_ascii($str) protected static function to_ascii($str)
{ {
static $extra = array( static $extra = array(
'ß' => 'ss', 'ß' => 'ss',
@ -1206,14 +1206,7 @@ class groupdav_principals extends groupdav_handler
($account_lid = $this->accounts->id2name($account_id))) ($account_lid = $this->accounts->id2name($account_id)))
{ {
$proxys[$account_id] = $account_lid; $proxys[$account_id] = $account_lid;
// for groups add members too, if app is not addressbook // no need to add group-members, ACL grants to groups are understood by WebDAV ACL (tested with iCal)
if ($account_id < 0 && $app != 'addressbook')
{
foreach($this->accounts->members($account_id) as $account_id => $account_lid)
{
$proxys[$account_id] = $account_lid;
}
}
} }
//echo "<p>$account_id ($account_lid): (rights=$rights & mask=$mask) == right=$right --> ".array2string(($rights & $mask) == $right)."</p>\n"; //echo "<p>$account_id ($account_lid): (rights=$rights & mask=$mask) == right=$right --> ".array2string(($rights & $mask) == $right)."</p>\n";
} }
@ -1475,7 +1468,6 @@ class groupdav_principals extends groupdav_handler
function read($id) function read($id)
{ {
return false; return false;
//return $this->accounts->read($id);
} }
/** /**