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

Handle all dates correctly in Roundcube user's timezone (as set in prefs)

Browse source
This commit is contained in:
Thomas Bruederli 2011-06-18 16:45:19 -06:00
parent 7dbd148a29
commit 9a0ee47037
2 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
plugins/calendar/calendar.js
View file

@ -40,6 +40,7 @@ function rcube_calendar(settings)
/*** private vars ***/ /*** private vars ***/
var me = this; var me = this;
var gmt_offset = (new Date().getTimezoneOffset() / -60) - (settings.timezone || 0);
var day_clicked = day_clicked_ts = 0; var day_clicked = day_clicked_ts = 0;
var ignore_click = false; var ignore_click = false;
@ -80,6 +81,16 @@ function rcube_calendar(settings)
return date; return date;
}; };
// convert the given Date object into a unix timestamp respecting browser's and user's timezone settings
var date2unixtime = function(date) {
return date.getTime()/1000 + gmt_offset;
};
var fromunixtime = function(ts) {
ts -= gmt_offset;
return new Date(ts * 1000);
}
// create a nice human-readable string for the date/time range // create a nice human-readable string for the date/time range
var event_date_text = function(event) var event_date_text = function(event)
{ {
@ -225,7 +236,7 @@ function rcube_calendar(settings)
$('select.edit-alarm-type').val(alarm[1]); $('select.edit-alarm-type').val(alarm[1]);
if (alarm[0].match(/@(\d+)/)) { if (alarm[0].match(/@(\d+)/)) {
var ondate = new Date(parseInt(RegExp.$1) * 1000); var ondate = fromunixtime(parseInt(RegExp.$1));
$('select.edit-alarm-offset').val('@'); $('select.edit-alarm-offset').val('@');
$('input.edit-alarm-date').val($.fullCalendar.formatDate(ondate, settings['date_format'])); $('input.edit-alarm-date').val($.fullCalendar.formatDate(ondate, settings['date_format']));
$('input.edit-alarm-time').val($.fullCalendar.formatDate(ondate, settings['time_format'])); $('input.edit-alarm-time').val($.fullCalendar.formatDate(ondate, settings['time_format']));
@ -305,8 +316,8 @@ function rcube_calendar(settings)
// post data to server // post data to server
var data = { var data = {
calendar: event.calendar, calendar: event.calendar,
start: start.getTime()/1000, start: date2unixtime(start),
end: end.getTime()/1000, end: date2unixtime(end),
allday: allday.checked?1:0, allday: allday.checked?1:0,
title: title.val(), title: title.val(),
description: description.val(), description: description.val(),
@ -325,7 +336,7 @@ function rcube_calendar(settings)
if (alarm) { if (alarm) {
var val, offset = $('select.edit-alarm-offset').val(); var val, offset = $('select.edit-alarm-offset').val();
if (offset == '@') if (offset == '@')
data.alarms = '@' + (parse_datetime($('input.edit-alarm-time').val(), $('input.edit-alarm-date').val()).getTime()/1000) + ':' + alarm; data.alarms = '@' + date2unixtime(parse_datetime($('input.edit-alarm-time').val(), $('input.edit-alarm-date').val())) + ':' + alarm;
else if ((val = parseInt($('input.edit-alarm-value').val())) && !isNaN(val) && val >= 0) else if ((val = parseInt($('input.edit-alarm-value').val())) && !isNaN(val) && val >= 0)
data.alarms = offset[0] + val + offset[1] + ':' + alarm; data.alarms = offset[0] + val + offset[1] + ':' + alarm;
} }
@ -342,7 +353,7 @@ function rcube_calendar(settings)
if (until == 'count') if (until == 'count')
data.recurrence.COUNT = rrtimes.val(); data.recurrence.COUNT = rrtimes.val();
else if (until == 'until') else if (until == 'until')
data.recurrence.UNTIL = parse_datetime(endtime.val(), rrenddate.val()).getTime()/1000; data.recurrence.UNTIL = date2unixtime(parse_datetime(endtime.val(), rrenddate.val()));
if (freq == 'WEEKLY') { if (freq == 'WEEKLY') {
var byday = []; var byday = [];
@ -516,8 +527,8 @@ function rcube_calendar(settings)
var actions, adismiss, asnooze, alarm, html, event_ids = []; var actions, adismiss, asnooze, alarm, html, event_ids = [];
for (var actions, html, alarm, i=0; i < alarms.length; i++) { for (var actions, html, alarm, i=0; i < alarms.length; i++) {
alarm = alarms[i]; alarm = alarms[i];
alarm.start = new Date(alarm.start * 1000); alarm.start = $.fullCalendar.parseISO8601(alarm.start, true);
alarm.end = new Date(alarm.end * 1000); alarm.end = $.fullCalendar.parseISO8601(alarm.end, true);
event_ids.push(alarm.id); event_ids.push(alarm.id);
html = '<h3 class="event-title">' + Q(alarm.title) + '</h3>'; html = '<h3 class="event-title">' + Q(alarm.title) + '</h3>';
@ -836,7 +847,7 @@ function rcube_calendar(settings)
right: 'agendaDay,agendaWeek,month,table' right: 'agendaDay,agendaWeek,month,table'
}, },
aspectRatio: 1, aspectRatio: 1,
ignoreTimezone: false, // will translate event dates to the client's timezone ignoreTimezone: true, // will treat the given date strings as in local (browser's) timezone
height: $('#main').height(), height: $('#main').height(),
eventSources: event_sources, eventSources: event_sources,
monthNames : settings['months'], monthNames : settings['months'],
@ -952,8 +963,8 @@ function rcube_calendar(settings)
var data = { var data = {
id: event.id, id: event.id,
calendar: event.calendar, calendar: event.calendar,
start: event.start.getTime()/1000, start: date2unixtime(event.start),
end: event.end.getTime()/1000, end: date2unixtime(event.end),
allday: allDay?1:0 allday: allDay?1:0
}; };
if (event.recurrence) if (event.recurrence)
@ -967,8 +978,8 @@ function rcube_calendar(settings)
var data = { var data = {
id: event.id, id: event.id,
calendar: event.calendar, calendar: event.calendar,
start: event.start.getTime()/1000, start: date2unixtime(event.start),
end: event.end.getTime()/1000 end: date2unixtime(event.end),
}; };
if (event.recurrence) if (event.recurrence)
recurring_edit_confirm(data, 'resize'); recurring_edit_confirm(data, 'resize');

8
plugins/calendar/calendar.php
View file

@ -604,8 +604,8 @@ class calendar extends rcube_plugin
$event['recurrence_text'] = $this->_recurrence_text($event['recurrence']); $event['recurrence_text'] = $this->_recurrence_text($event['recurrence']);
$json[] = array( $json[] = array(
'start' => date('c', $event['start']), // ISO 8601 date (added in PHP 5) 'start' => gmdate('c', $this->fromGMT($event['start'])), // client treats date strings as they were in users's timezone
'end' => date('c', $event['end']), // ISO 8601 date (added in PHP 5) 'end' => gmdate('c', $this->fromGMT($event['end'])), // so shift timestamps to users's timezone and render a date string
'description' => strval($event['description']), 'description' => strval($event['description']),
'location' => strval($event['location']), 'location' => strval($event['location']),
'className' => ($addcss ? 'fc-event-cal-'.asciiwords($event['calendar'], true).' ' : '') . 'cat-' . asciiwords($event['categories'], true), 'className' => ($addcss ? 'fc-event-cal-'.asciiwords($event['calendar'], true).' ' : '') . 'cat-' . asciiwords($event['categories'], true),
@ -625,8 +625,8 @@ class calendar extends rcube_plugin
foreach ($alarms as $alarm) { foreach ($alarms as $alarm) {
$out[] = array( $out[] = array(
'id' => $alarm['id'], 'id' => $alarm['id'],
'start' => $alarm['start'], 'start' => gmdate('c', $this->fromGMT($alarm['start'])),
'end' => $alarm['end'], 'end' => gmdate('c', $this->fromGMT($alarm['end'])),
'allDay' => ($event['allday'] == 1)?true:false, 'allDay' => ($event['allday'] == 1)?true:false,
'title' => $alarm['title'], 'title' => $alarm['title'],
'location' => $alarm['location'], 'location' => $alarm['location'],