nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-24 02:24:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for CLASS attribute problem (CONFIDENTIAL value) and invalid processing of ->hide_alarm configuration option:

Browse Source
This commit is contained in:
Jason Alavaliant 2013-04-21 21:47:59 +12:00 committed by Andrew McMillan
parent 1d54f57533
commit 2f27d181f0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/caldav-REPORT.php
View File

@ -116,7 +116,7 @@ function component_to_xml( $properties, $item ) {
break;
}
if ( $type == 'calendar' ) {
if ( isset($properties['calendar-data']) || isset($properties['displayname']) ) {
if ( isset($properties['urn:ietf:params:xml:ns:caldav:calendar-data']) || isset($properties['DAV::displayname']) ) {
if ( !$request->AllowedTo('all') && $session->user_no != $item->user_no ) {
// the user is not admin / owner of this calendar looking at his calendar and can not admin the other cal
if ( $item->class == 'CONFIDENTIAL' || !$request->AllowedTo('read') ) {
@ -130,7 +130,7 @@ function component_to_xml( $properties, $item ) {
if ( isset($c->hide_alarm) && $c->hide_alarm ) {
$dav_resource = new DAVResource($item->dav_name);
if ( isset($properties['calendar-data']) && !$dav_resource->HavePrivilegeTo('write') ) {
if ( isset($properties['urn:ietf:params:xml:ns:caldav:calendar-data']) && !$dav_resource->HavePrivilegeTo('write') ) {
dbg_error_log("REPORT","Stripping event alarms for: %s", $item->dav_name );
$vcal = new vCalendar($caldav_data);
$vcal->ClearComponents('VALARM');