cvs: php4 /pear/Date Calc.php

mohrt Tue Dec 12 06:58:03 2000 EDT Modified files: /php4/pear/Date Calc.php Log: fixed bug in beginOfWeek() Index: php4/pear/Date/Calc.php diff -u php4/pear/Date/Calc.php:1.10 php4/pear/Date/Calc.php:1.11 --- php4/pear/Date/Calc.php:1.10 Wed Dec 6 11:36:44 2000 +++ php4/pear/Date/Calc.php Tue Dec 12 06:58:03 2000 @@ -24,7 +24,7 @@ * * @access public * - * @version 1.2.3 + * @version 1.2.4 * @author Monte Ohrt <monte@ispi.net> */ @@ -891,8 +891,21 @@ $this_weekday = Date_Calc::dayOfWeek($day,$month,$year); - $beginOfWeek = (Date_Calc::dateToDays($day,$month,$year) - - ($this_weekday - DATE_CALC_BEGIN_WEEKDAY)); + if(DATE_CALC_BEGIN_WEEKDAY == 1) + { + if($this_weekday == 0) + $beginOfWeek = Date_Calc::dateToDays($day,$month,$year) - 6; + else + $beginOfWeek = Date_Calc::dateToDays($day,$month,$year) + - $this_weekday + 1; + } + else + $beginOfWeek = (Date_Calc::dateToDays($day,$month,$year) + - $this_weekday); + + + /* $beginOfWeek = (Date_Calc::dateToDays($day,$month,$year) + - ($this_weekday - DATE_CALC_BEGIN_WEEKDAY)); */ return(Date_Calc::daysToDate($beginOfWeek,$format)); @@ -1032,9 +1045,9 @@ $week_array = array(); // date for the column of week - $curr_day = (Date_Calc::dateToDays($day,$month,$year) - - ((Date_Calc::dayOfWeek($day,$month,$year) - DATE_CALC_BEGIN_WEEKDAY))); - + + $curr_day = Date_Calc::beginOfWeek($day,$month,$year,"%E"); + for($counter=0; $counter <= 6; $counter++) { $week_array[$counter] = Date_Calc::daysToDate($curr_day,$format);