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

Correct errors in GET for confidential events.

Browse Source
This commit is contained in:
Andrew McMillan 2009-03-18 14:35:21 +13:00
parent ed9b96018d
commit 5a81f0370a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/caldav-GET.php
View File

@ -50,7 +50,7 @@ else if ( $qry->rows == 1 && ! $request->IsCollection() ) {
if ( $event->class == 'CONFIDENTIAL' && ! $request->AllowedTo('modify') ) { if ( $event->class == 'CONFIDENTIAL' && ! $request->AllowedTo('modify') ) {
// if the event is confidential we fake one that just says "Busy" // if the event is confidential we fake one that just says "Busy"
$confidential = new iCalComponent(); $confidential = new iCalComponent();
$confidential->SetType($first->GetType()); $confidential->SetType($event->caldav_type);
$confidential->AddProperty( 'SUMMARY', translate('Busy') ); $confidential->AddProperty( 'SUMMARY', translate('Busy') );
$confidential->AddProperty( 'CLASS', 'CONFIDENTIAL' ); $confidential->AddProperty( 'CLASS', 'CONFIDENTIAL' );
$confidential->SetProperties( $first->GetProperties('DTSTART'), 'DTSTART' ); $confidential->SetProperties( $first->GetProperties('DTSTART'), 'DTSTART' );
@ -130,13 +130,13 @@ else {
if ( $event->class == 'CONFIDENTIAL' ) { if ( $event->class == 'CONFIDENTIAL' ) {
// if the event is confidential we fake one that just says "Busy" // if the event is confidential we fake one that just says "Busy"
$confidential = new iCalComponent(); $confidential = new iCalComponent();
$confidential->SetType($first->GetType()); $confidential->SetType($resource->GetType());
$confidential->AddProperty( 'SUMMARY', translate('Busy') ); $confidential->AddProperty( 'SUMMARY', translate('Busy') );
$confidential->AddProperty( 'CLASS', 'CONFIDENTIAL' ); $confidential->AddProperty( 'CLASS', 'CONFIDENTIAL' );
$confidential->SetProperties( $first->GetProperties('DTSTART'), 'DTSTART' ); $confidential->SetProperties( $resource->GetProperties('DTSTART'), 'DTSTART' );
$confidential->SetProperties( $first->GetProperties('RRULE'), 'RRULE' ); $confidential->SetProperties( $resource->GetProperties('RRULE'), 'RRULE' );
$confidential->SetProperties( $first->GetProperties('DURATION'), 'DURATION' ); $confidential->SetProperties( $resource->GetProperties('DURATION'), 'DURATION' );
$confidential->SetProperties( $first->GetProperties('DTEND'), 'DTEND' ); $confidential->SetProperties( $resource->GetProperties('DTEND'), 'DTEND' );
$vcal->AddComponent($confidential); $vcal->AddComponent($confidential);
} }