extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-21 05:19:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: fixed typo in merge, denying implicit participants rights eg. required to accept a meeting

Browse Source
This commit is contained in:
Ralf Becker 2011-08-03 13:22:49 +00:00
parent ef559e486a
commit d8ecd9af9e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_bo.inc.php
View File

@ -1133,7 +1133,7 @@ class calendar_bo
if ($uid == $this->user || $uid < 0 && in_array($this->user,$GLOBALS['egw']->accounts->members($uid,true))) if ($uid == $this->user || $uid < 0 && in_array($this->user,$GLOBALS['egw']->accounts->members($uid,true)))
{ {
// if we are a participant, we have an implicite FREEBUSY, READ and PRIVAT grant // if we are a participant, we have an implicite FREEBUSY, READ and PRIVAT grant
$grant |= EGW_ACL_FREEBUSY | EGW_ACL_READ | EGW_ACL_PRIVATE; $grants |= EGW_ACL_FREEBUSY | EGW_ACL_READ | EGW_ACL_PRIVATE;
break; break;
} }
elseif ($this->grants[$uid] & EGW_ACL_READ) elseif ($this->grants[$uid] & EGW_ACL_READ)
@ -1578,7 +1578,7 @@ class calendar_bo
{ {
$arr = &$users; $arr = &$users;
} }
$arr[$name] = Array( $arr[$name] = Array(
'grantor' => $id, 'grantor' => $id,
'value' => ($type == 'g' ? 'g_' : '') . $id, 'value' => ($type == 'g' ? 'g_' : '') . $id,
@ -1623,7 +1623,7 @@ class calendar_bo
} }
uksort($users,'strnatcasecmp'); uksort($users,'strnatcasecmp');
uksort($groups,'strnatcasecmp'); uksort($groups,'strnatcasecmp');
return $users + $groups; // users first and then groups, both alphabeticaly return $users + $groups; // users first and then groups, both alphabeticaly
} }