extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

$ts += DAY_s in a 'for' loop does not work for daylight savings in week view

Browse Source 
because the day is longer than DAY_s: Fullday events will be added twice.
This commit is contained in:
Hans-Jürgen Tappe 2010-02-07 14:37:27 +00:00
parent 3c13536c3a
commit b712cc0480
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_bo.inc.php
View File

@ -471,7 +471,7 @@ class calendar_bo
$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3',False,$start,$end,$events); $this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3',False,$start,$end,$events);
} }
// create empty entries for each day in the reported time // create empty entries for each day in the reported time
for($ts = $start; $ts <= $end; $ts += DAY_s) for($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
{ {
$daysEvents[$this->date2string($ts)] = array(); $daysEvents[$this->date2string($ts)] = array();
} }
@ -482,9 +482,13 @@ class calendar_bo
$e_end = min($this->date2ts($event['end'])-1,$end); $e_end = min($this->date2ts($event['end'])-1,$end);
// add event to each day in the reported time // add event to each day in the reported time
for($ts = $e_start; $ts <= $e_end; $ts += DAY_s) $ts = $e_start;
// $ts += DAY_s in a 'for' loop does not work for daylight savings in week view
// because the day is longer than DAY_s: Fullday events will be added twice.
while ($ts <= $e_end)
{ {
$daysEvents[$ymd = $this->date2string($ts)][] =& $events[$k]; $daysEvents[$ymd = $this->date2string($ts)][] =& $events[$k];
$ts = strtotime("+1 day",$ts);
} }
if ($ymd != ($last = $this->date2string($e_end))) if ($ymd != ($last = $this->date2string($e_end)))
{ {