Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix allday field name confusion

Browse source
This commit is contained in:
Thomas Bruederli 2011-06-18 15:21:20 -06:00
parent a1d216cd31
commit 7dbd148a29
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/calendar.php
View file

@ -609,7 +609,7 @@ class calendar extends rcube_plugin
'description' => strval($event['description']),
'location' => strval($event['location']),
'className' => ($addcss ? 'fc-event-cal-'.asciiwords($event['calendar'], true).' ' : '') . 'cat-' . asciiwords($event['categories'], true),
'allDay' => ($event['all_day'] == 1)?true:false,
'allDay' => ($event['allday'] == 1)?true:false,
) + $event;
}
return json_encode($json);
@ -627,7 +627,7 @@ class calendar extends rcube_plugin
'id' => $alarm['id'],
'start' => $alarm['start'],
'end' => $alarm['end'],
'allDay' => ($event['all_day'] == 1)?true:false,
'allDay' => ($event['allday'] == 1)?true:false,
'title' => $alarm['title'],
'location' => $alarm['location'],
'calendar' => $alarm['calendar'],

1
plugins/calendar/drivers/database/database_driver.php
View file

@ -639,6 +639,7 @@ class database_driver extends calendar_driver
$event['id'] = $event['event_id'];
$event['start'] = strtotime($event['start']);
$event['end'] = strtotime($event['end']);
$event['allday'] = intval($event['all_day']);
$event['free_busy'] = $free_busy_map[$event['free_busy']];
$event['calendar'] = $event['calendar_id'];

19
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -265,7 +265,7 @@ class kolab_calendar
$allday = $start_time == '00:00:00' && $start_time == date('H:i:s', $rec['end-date']);
if ($allday) // in Roundcube all-day events only go until 23:59:59 of the last day
$rec['end-date']--;
// convert alarm time into internal format
if ($rec['alarm']) {
$alarm_value = $rec['alarm'];
@ -301,7 +301,7 @@ class kolab_calendar
$rrule['BYDAY'] = join(',', $byday);
}
if ($recurrence['daynumber']) {
if ($recurrence['type'] == 'monthday')
if ($recurrence['type'] == 'monthday' || $recurrence['type'] == 'daynumber')
$rrule['BYMONTHDAY'] = $recurrence['daynumber'];
else if ($recurrence['type'] == 'yearday')
$rrule['BYYEARDAY'] = $recurrence['daynumber'];
@ -328,7 +328,7 @@ class kolab_calendar
'description' => $rec['body'],
'start' => $rec['start-date'],
'end' => $rec['end-date'],
'all_day' => $allday,
'allday' => $allday,
'recurrence' => $rrule,
'alarms' => $alarm_value . $alarm_unit,
'categories' => $rec['categories'],
@ -349,8 +349,7 @@ class kolab_calendar
$daymap = array('MO'=>'monday','TU'=>'tuesday','WE'=>'wednesday','TH'=>'thursday','FR'=>'friday','SA'=>'saturday','SU'=>'sunday');
$object = array
(
$object = array(
// kolab => roundcube
'summary' => $event['title'],
'location'=> $event['location'],
@ -448,9 +447,13 @@ class kolab_calendar
$object['recurrence']['type']=array(split(',',$ra['UNTIL']));
}
//whole dday event
if($event['allday']==1)
$object['_is_all_day']=1;
// whole day event
if ($event['allday']) {
$object['end-date']++;
$object['_is_all_day'] = 1;
}
return $object;
}