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

new parameter $clear_private_infos_users to read using EGW_ACL_FREEBUSY instead of EGW_ACL_READ (eg. private appointments) and clear private infos, if no read rights

Browse Source
This commit is contained in:
Ralf Becker 2010-12-02 21:50:22 +00:00
parent 44bc1a28c8
commit 83fd244b5c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_activesync.inc.php
View File

@ -182,7 +182,7 @@ class calendar_activesync implements activesync_plugin_read
debugLog (__METHOD__."('$folderid', $id, truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
$this->backend->splitID($folderid, $type, $account);
if ($type != 'calendar' || !($event = $this->calendar->read($id))) // || !in_array($account,$event['participants']))
if ($type != 'calendar' || !($event = $this->calendar->read($id,'ts',false,$account)))
{
return false;
}

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

@ -851,15 +851,18 @@ class calendar_bo
* @param mixed $date=null date to specify a single event of a series
* @param boolean $ignore_acl should we ignore the acl, default False for a single id, true for multiple id's
* @param string $date_format='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in servertime, 'array'=array, or string with date-format
* @param array|init $clear_privat_infos_users=null if not null, return events with EGW_ACL_FREEBUSY too,
* but call clear_private_infos() with the given users
* @return boolean|array event or array of id => event pairs, false if the acl-check went wrong, null if $ids not found
*/
function read($ids,$date=null,$ignore_acl=False,$date_format='ts')
function read($ids,$date=null,$ignore_acl=False,$date_format='ts',$clear_private_infos_users=null)
{
if ($date) $date = $this->date2ts($date);
$return = null;
if ($ignore_acl || is_array($ids) || ($return = $this->check_perms(EGW_ACL_READ,$ids,0,$date_format,$date)))
$check = $clear_private_infos_users ? EGW_ACL_FREEBUSY : EGW_ACL_READ;
if ($ignore_acl || is_array($ids) || ($return = $this->check_perms($check,$ids,0,$date_format,$date)))
{
if (is_array($ids) || !isset(self::$cached_event['id']) || self::$cached_event['id'] != $ids ||
self::$cached_event_date_format != $date_format ||
@ -880,7 +883,7 @@ class calendar_bo
self::$cached_event = array_shift($events);
self::$cached_event_date_format = $date_format;
self::$cached_event_date = $date;
$return =& self::$cached_event;
$return = self::$cached_event;
}
}
}
@ -889,6 +892,10 @@ class calendar_bo
$return = self::$cached_event;
}
}
if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(EGW_ACL_READ,$return))
{
$this->clear_private_infos($return, (array)$clear_private_infos_users);
}
if ($this->debug && ($this->debug > 1 || $this->debug == 'read'))
{
$this->debug_message('calendar_bo::read(%1,%2,%3,%4)=%5',True,$ids,$date,$ignore_acl,$date_format,$return);