diff options
| author | jwangen <jwangen> | 2002-10-19 19:54:19 +0000 |
|---|---|---|
| committer | jwangen <jwangen> | 2002-10-19 19:54:19 +0000 |
| commit | 11aef1af4e4f9410084767762f16fc3366132405 (patch) | |
| tree | 320776a8cb9b3ca8b466c637639d4178868fb211 /functions/ical_parser.php | |
| parent | 173647337cd3d6dcfd0033f06103b926b6ca98c0 (diff) | |
| download | phpicalendar-11aef1af4e4f9410084767762f16fc3366132405.tar.gz phpicalendar-11aef1af4e4f9410084767762f16fc3366132405.tar.bz2 phpicalendar-11aef1af4e4f9410084767762f16fc3366132405.zip | |
Can now choose timezone option from config
Diffstat (limited to 'functions/ical_parser.php')
| -rw-r--r-- | functions/ical_parser.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/functions/ical_parser.php b/functions/ical_parser.php index 9362e13..5fdbd26 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -421,11 +421,19 @@ if ($parse_file) { $start_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); $dlst = date('I', $start_unixtime); - $server_offset_tmp = date('O', $start_unixtime); + $server_offset_tmp = chooseOffset($start_unixtime); if (isset($tz_dtstart)) { - $offset_tmp = $tz_array[$tz_dtstart][$dlst]; + if (array_key_exists($tz_dtstart, $tz_array)) { + $offset_tmp = $tz_array[$tz_dtstart][$dlst]; + } else { + $offset_tmp = '+0000'; + } } elseif (isset($calendar_tz)) { - $offset_tmp = $tz_array[$calendar_tz][$dlst]; + if (array_key_exists($calendar_tz, $tz_array)) { + $offset_tmp = $tz_array[$calendar_tz][$dlst]; + } else { + $offset_tmp = '+0000'; + } } else { $offset_tmp = $server_offset_tmp; } @@ -452,7 +460,7 @@ if ($parse_file) { $end_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); $dlst = date('I', $end_unixtime); - $server_offset_tmp = date('O', $start_unixtime); + $server_offset_tmp = chooseOffset($end_unixtime); if (isset($tz_dtend)) { $offset_tmp = $tz_array[$tz_dtend][$dlst]; } elseif (isset($calendar_tz)) { |