diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 531c1b5b20..00ea5cc675 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -1424,8 +1424,10 @@ class calendar_uiforms extends calendar_ui $content['participants'][$row]['delete_id'] = strpbrk($uid,'"\'<>') !== false ? md5($uid) : $uid; //echo "

$uid ($quantity): $role --> {$content['participants'][$row]['role']}

\n"; - $readonlys['participants'][$row]['status'] = !$this->bo->check_status_perms($uid,$event); - $readonlys['participants']['delete'][$uid] = $preserv['hide_delete'] || !$this->bo->check_perms(EGW_ACL_EDIT,$event); + if (!$this->bo->check_status_perms($uid,$event)) + $readonlys['participants'][$row]['status'] = true; + if ($preserv['hide_delete'] || !$this->bo->check_perms(EGW_ACL_EDIT,$event)) + $readonlys['participants']['delete'][$uid] = true; // todo: make the participants available as links with email as title $content['participants'][$row++]['title'] = $this->get_title($uid); // enumerate group-invitations, so people can accept/reject them @@ -1446,7 +1448,8 @@ class calendar_uiforms extends calendar_ui ); $readonlys['participants'][$row]['quantity'] = $readonlys['participants']['delete'][$member] = true; // read access is enough to invite participants, but you need edit rights to change status - $readonlys['participants'][$row]['status'] = !$this->bo->check_perms(EGW_ACL_EDIT,0,$member); + if (!$this->bo->check_perms(EGW_ACL_EDIT,0,$member)) + $readonlys['participants'][$row]['status'] = true; //$readonlys[$row.'[status]'] = !$this->bo->check_perms(EGW_ACL_EDIT,0,$member); $content['participants'][$row++]['title'] = common::grab_owner_name($member); } diff --git a/calendar/setup/timezones.sqlite b/calendar/setup/timezones.sqlite index b7e014abf8..9484230f0a 100644 Binary files a/calendar/setup/timezones.sqlite and b/calendar/setup/timezones.sqlite differ