extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-04 13:10:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Special Lightning CalDAV treatment

Browse Source
This commit is contained in:
Jörg Lehrke 2010-05-18 14:41:22 +00:00
parent df36afa1ed
commit 2552476036
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -538,7 +538,16 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
self::etag2value($this->http_if_match), false, 0, $this->principalURL, $user))) self::etag2value($this->http_if_match), false, 0, $this->principalURL, $user)))
{ {
if ($this->debug) error_log(__METHOD__."(,$id) importVCal($options[content]) returned false"); if ($this->debug) error_log(__METHOD__."(,$id) importVCal($options[content]) returned false");
return '403 Forbidden'; if ($eventId && $cal_id === false)
{
// ignore import failures
$cal_id = $eventId;
$retval = true;
}
else
{
return '403 Forbidden';
}
} }
header('ETag: '.$this->get_etag($cal_id)); header('ETag: '.$this->get_etag($cal_id));

37
calendar/inc/class.calendar_ical.inc.php
View File

@ -832,7 +832,7 @@ class calendar_ical extends calendar_boupdate
$attributes['LAST-MODIFIED'] = $modified; $attributes['LAST-MODIFIED'] = $modified;
} }
$attributes['DTSTAMP'] = time(); $attributes['DTSTAMP'] = time();
foreach ($event['alarm'] as $alarmID => $alarmData) foreach ((array)$event['alarm'] as $alarmID => $alarmData)
{ {
// skip over alarms that don't have the minimum required info // skip over alarms that don't have the minimum required info
if (!$alarmData['offset'] && !$alarmData['time']) continue; if (!$alarmData['offset'] && !$alarmData['time']) continue;
@ -873,13 +873,27 @@ class calendar_ical extends calendar_boupdate
// RFC requires DESCRIPTION for DISPLAY // RFC requires DESCRIPTION for DISPLAY
if (!$event['title'] && !$description) continue; if (!$event['title'] && !$description) continue;
if ($this->productName == 'lightning')
{
// return only future alarms to lightning
if (($nextOccurence = $this->read($event['id'], $this->now_su + $alarmData['offset'], false, 'server')))
{
$alarmData['time'] = $nextOccurence['start'] - $alarmData['offset'];
$alarmData['offset'] = false;
}
else
{
continue;
}
}
if (!empty($event['whole_day']) && $alarmData['offset']) if (!empty($event['whole_day']) && $alarmData['offset'])
{ {
$alarmData['time'] = $event['start'] - $alarmData['offset']; $alarmData['time'] = $event['start'] - $alarmData['offset'];
$alarmData['offset'] = false; $alarmData['offset'] = false;
} }
$valarm = Horde_iCalendar::newComponent('VALARM',$vevent); $valarm = Horde_iCalendar::newComponent('VALARM',$vevent);
if ($alarmData['offset']) if ($alarmData['offset'])
{ {
@ -1015,7 +1029,7 @@ class calendar_ical extends calendar_boupdate
* @param int $user=null account_id of owner, default null * @param int $user=null account_id of owner, default null
* @param string $charset The encoding charset for $text. Defaults to * @param string $charset The encoding charset for $text. Defaults to
* utf-8 for new format, iso-8859-1 for old format. * utf-8 for new format, iso-8859-1 for old format.
* @return int|boolean cal_id > 0 on success, false on failure or 0 for a failed etag * @return int|boolean cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied
*/ */
function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null) function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null)
{ {
@ -1272,7 +1286,7 @@ class calendar_ical extends calendar_boupdate
} }
else else
{ {
return false; // no permission return 0; // no permission
} }
} }
// check if an owner is set and the current user has add rights // check if an owner is set and the current user has add rights
@ -2190,6 +2204,17 @@ class calendar_ical extends calendar_boupdate
} }
return false; return false;
} }
$mozillaACK = $component->getAttribute('X-MOZ-LASTACK');
if (!is_a($mozillaACK, 'PEAR_Error'))
{
if ($this->log)
{
error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()' .
"X-MOZ-LASTACK found\n",3,$this->logfile);
}
return false;
}
if (!empty($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) if (!empty($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
{ {