diff --git a/js/data/timezones.js b/js/data/timezones.js index b45ab98..0935cfe 100644 --- a/js/data/timezones.js +++ b/js/data/timezones.js @@ -135,7 +135,6 @@ Zarafa.plugins.calendarimporter.data.Timezones = Ext.extend(Object, { /* Atlantic */ /* Antarctica */ /* Artic */ - /* /* Asia */ /* Indian */ /* Others */ diff --git a/js/dialogs/ImportPanel.js b/js/dialogs/ImportPanel.js index e22840a..5371669 100644 --- a/js/dialogs/ImportPanel.js +++ b/js/dialogs/ImportPanel.js @@ -104,7 +104,7 @@ Zarafa.plugins.calendarimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, { var parsedData = new Array(eventdata.events.length); for(var i=0; i < eventdata.events.length; i++) { - parsedData[i] = new Array(eventdata.events[i]["SUMMARY"], new Date(parseInt(eventdata.events[i]["DTSTART"]) + local_tz_offset - tz_offset), new Date(parseInt(eventdata.events[i]["DTEND"]) + local_tz_offset - tz_offset), eventdata.events[i]["LOCATION"], eventdata.events[i]["DESCRIPTION"]); + parsedData[i] = new Array(eventdata.events[i]["SUMMARY"], new Date(parseInt(eventdata.events[i]["DTSTART"]) + local_tz_offset + tz_offset), new Date(parseInt(eventdata.events[i]["DTEND"]) + local_tz_offset + tz_offset), eventdata.events[i]["LOCATION"], eventdata.events[i]["DESCRIPTION"]); } } else { return null; diff --git a/php/ical/calendar.txt b/php/ical/calendar.txt index 75a1fd5..cbe61bc 100644 --- a/php/ical/calendar.txt +++ b/php/ical/calendar.txt @@ -7,8 +7,8 @@ X-WR-CALNAME:Testkalender X-WR-TIMEZONE:America/Detroit X-WR-CALDESC:Nur zum testen vom Google Kalender BEGIN:VEVENT -DTSTART;TZID="America/Detroit":20121227T100000 -DTEND;TZID="America/Detroit":20121227T110000 +DTSTART:20121227T150000Z +DTEND:20121227T160000Z DTSTAMP:20110121T195741Z UID:1koigufm110c5hnq6ln57murd4@google.com CREATED:20110119T142901Z diff --git a/php/ical/class.icalparser.php b/php/ical/class.icalparser.php index 73a1733..98ace19 100644 --- a/php/ical/class.icalparser.php +++ b/php/ical/class.icalparser.php @@ -241,7 +241,7 @@ class ICal { $this_tz = new DateTimeZone($tz); $tz_now = new DateTime("now", $this_tz); $tz_offset = $this_tz->getOffset($tz_now); - $timestamp_utc = $timestamp + $tz_offset; + $timestamp_utc = $timestamp - $tz_offset; } else { $timestamp_utc = $timestamp; }