[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.54,1.66.2.55

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv9201

Modified Files:
      Tag: Version-0_9_14-branch
        class.uicalendar.inc.php 
Log Message:
fix for gnu-bug #136: 
dates in week-selectbox are (sometimes) wrong, the endate of a week is the same 
as the startdate of the next one

This is caused by changes in daylight saveing and useing midnight for the 
calculation, changed it to midday

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.54
retrieving revision 1.66.2.55
diff -C2 -r1.66.2.54 -r1.66.2.55
*** class.uicalendar.inc.php    5 Mar 2003 20:52:18 -0000       1.66.2.54
--- class.uicalendar.inc.php    9 Mar 2003 19:29:13 -0000       1.66.2.55
***************
*** 2353,2358 ****
                                for ($i = -7; $i <= 7; $i++)
                                {
!                                       $begin = $sun + (604800 * $i);
!                                       $end = $begin + 604799;
                                        $str .= '<option value="' . 
$GLOBALS['phpgw']->common->show_date($begin,'Ymd') . '"'.($begin <= $thisdate 
&& $end >= $thisdate?' selected':'').'>'
                                           . 
$GLOBALS['phpgw']->common->show_date($begin,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
 . ' - '
--- 2353,2359 ----
                                for ($i = -7; $i <= 7; $i++)
                                {
!                                       $begin = $sun + (7*24*60*60 * $i) + 
12*60*60;   // we use midday, that changes in daylight-saveing does not effect 
us
!                                       $end = $begin + 6*24*60*60;
! //                                    echo "<br>$i: ".date('d.m.Y 
H:i',$begin).' - '.date('d.m.Y H:i',$end);
                                        $str .= '<option value="' . 
$GLOBALS['phpgw']->common->show_date($begin,'Ymd') . '"'.($begin <= $thisdate 
&& $end >= $thisdate?' selected':'').'>'
                                           . 
$GLOBALS['phpgw']->common->show_date($begin,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
 . ' - '