forked from extern/egroupware
alarms now gets exported and imported too
alarm im- and export still needs some improvement
This commit is contained in:
parent
91fb43964b
commit
f4f6fa9be8
@ -257,7 +257,15 @@
|
|||||||
if ($created) $attributes['CREATED'] = $created;
|
if ($created) $attributes['CREATED'] = $created;
|
||||||
if (!$modified) $modified = $event['modified'];
|
if (!$modified) $modified = $event['modified'];
|
||||||
if ($modified) $attributes['LAST-MODIFIED'] = $modified;
|
if ($modified) $attributes['LAST-MODIFIED'] = $modified;
|
||||||
|
|
||||||
|
foreach($event['alarm'] as $alarmID => $alarmData)
|
||||||
|
{
|
||||||
|
$attributes['DALARM'] = $vcal->_exportDateTime($alarmData['time']);
|
||||||
|
$attributes['AALARM'] = $vcal->_exportDateTime($alarmData['time']);
|
||||||
|
// lets take only the first alarm
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
$attributes['UID'] = $eventGUID;
|
$attributes['UID'] = $eventGUID;
|
||||||
|
|
||||||
foreach($attributes as $key => $value)
|
foreach($attributes as $key => $value)
|
||||||
@ -290,7 +298,6 @@
|
|||||||
|
|
||||||
function importVCal($_vcalData, $cal_id=-1)
|
function importVCal($_vcalData, $cal_id=-1)
|
||||||
{
|
{
|
||||||
error_log('CALENDAR('.__LINE__.") $cal_id");
|
|
||||||
// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
|
// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
|
||||||
$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
|
$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
|
||||||
|
|
||||||
@ -581,7 +588,7 @@
|
|||||||
$defaultFields = array('public' => 'public', 'description' => 'description', 'end' => 'end',
|
$defaultFields = array('public' => 'public', 'description' => 'description', 'end' => 'end',
|
||||||
'start' => 'start', 'location' => 'location', 'recur_type' => 'recur_type',
|
'start' => 'start', 'location' => 'location', 'recur_type' => 'recur_type',
|
||||||
'recur_interval' => 'recur_interval', 'recur_data' => 'recur_data', 'recur_enddate' => 'recur_enddate',
|
'recur_interval' => 'recur_interval', 'recur_data' => 'recur_data', 'recur_enddate' => 'recur_enddate',
|
||||||
'title' => 'title', 'priority' => 'priority',
|
'title' => 'title', 'priority' => 'priority', 'alarms' => 'alarms',
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -614,7 +621,7 @@
|
|||||||
{
|
{
|
||||||
case 'd750i':
|
case 'd750i':
|
||||||
default:
|
default:
|
||||||
$this->supportedFields = $defaultFields + array('alarms' => 'alarms');
|
$this->supportedFields = $defaultFields;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user