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

fixed masking of confidential event components

Browse Source
This commit is contained in:
Ján Máté 2014-03-24 01:52:52 +01:00
parent cd343bd9f2
commit 6b37b2b422
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
inc/DAVResource.php
View File

@ -186,7 +186,7 @@ class DAVResource
* @param object $row The row from the DB.
*/
function FromRow($row) {
global $c;
global $c, $session;
if ( $row == null ) return;
@ -283,17 +283,24 @@ class DAVResource
$this->resource->location = null;
$this->resource->url = null;
}
else if ( isset($c->hide_alarm) && $c->hide_alarm && !$this->HavePrivilegeTo('write') ) {
$vcal1 = new iCalComponent($this->resource->caldav_data);
$comps = $vcal1->GetComponents();
$vcal2 = new iCalComponent();
$vcal2->VCalendar();
foreach( $comps AS $comp ) {
$comp->ClearComponents('VALARM');
$vcal2->AddComponent($comp);
else {
if ( strtoupper($this->resource->class)=='CONFIDENTIAL' && !$this->HavePrivilegeTo('all') && $session->user_no != $this->resource->user_no ) {
$vcal = new iCalComponent($this->resource->caldav_data);
$confidential = $vcal->CloneConfidential();
$this->resource->caldav_data = $confidential->Render();
}
if ( isset($c->hide_alarm) && $c->hide_alarm && !$this->HavePrivilegeTo('write') ) {
$vcal1 = new iCalComponent($this->resource->caldav_data);
$comps = $vcal1->GetComponents();
$vcal2 = new iCalComponent();
$vcal2->VCalendar();
foreach( $comps AS $comp ) {
$comp->ClearComponents('VALARM');
$vcal2->AddComponent($comp);
}
$this->resource->displayname = $this->resource->summary = $vcal2->GetPValue('SUMMARY');
$this->resource->caldav_data = $vcal2->Render();
}
$this->resource->displayname = $this->resource->summary = $vcal2->GetPValue('SUMMARY');
$this->resource->caldav_data = $vcal2->Render();
}
}
else if ( strtoupper(substr($this->resource->caldav_data,0,11)) == 'BEGIN:VCARD' ) {