holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed wrong series event end times for whole day events when events occur or span over a daylight saving date, fixed typos

Browse Source
This commit is contained in:
Christian Binder 2010-02-25 17:05:24 +00:00
parent c9ab7e557b
commit 8211aef3ff
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -853,9 +853,30 @@ class calendar_bo
//echo "<p>".$time." --> ignored as $ts < $start-$event_length</p>\n"; //echo "<p>".$time." --> ignored as $ts < $start-$event_length</p>\n";
continue; // to early or original event (returned by interator too) continue; // to early or original event (returned by interator too)
} }
//echo "<p>".$time." --> adding recurrence</p>\n";
$ts_end = $ts + $event_length;
// adjust ts_end for whole day events in case it does not fit due to
// spans over summer/wintertime adjusted days
if($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
!($arr_end['hour'] == 23 && $arr_end['minute'] == 59 && $arr_end['second'] == 59))
{
$arr_end['hour'] = 23;
$arr_end['minute'] = 59;
$arr_end['second'] = 59;
$ts_end_guess = $this->date2ts($arr_end);
if($ts_end_guess - $ts_end > DAY_s/2)
{
$ts_end = $ts_end_guess - DAY_s; // $ts_end_guess was one day too far in the future
}
else
{
$ts_end = $ts_end_guess; // $ts_end_guess was ok
}
}
$event['start'] = $ts; $event['start'] = $ts;
$event['end'] = $ts + $event_length; $event['end'] = $ts_end;
$events[] = $event; $events[] = $event;
} }
if ($this->debug && ((int) $this->debug > 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences')) if ($this->debug && ((int) $this->debug > 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences'))
@ -1037,7 +1058,7 @@ class calendar_bo
} }
/** /**
* Converts several date-types to a timestamp and optionaly converts user- to server-time * Converts several date-types to a timestamp and optionally converts user- to server-time
* *
* @param mixed $date date to convert, should be one of the following types * @param mixed $date date to convert, should be one of the following types
* string (!) in form YYYYMMDD or iso8601 YYYY-MM-DDThh:mm:ss or YYYYMMDDThhmmss * string (!) in form YYYYMMDD or iso8601 YYYY-MM-DDThh:mm:ss or YYYYMMDDThhmmss
@ -1051,7 +1072,7 @@ class calendar_bo
} }
/** /**
* Converts a date to an array and optionaly converts server- to user-time * Converts a date to an array and optionally converts server- to user-time
* *
* @param mixed $date date to convert * @param mixed $date date to convert
* @param boolean $server2user_time conversation between user- and server-time default False == Off * @param boolean $server2user_time conversation between user- and server-time default False == Off