From: <ji...@us...> - 2008-12-20 03:22:58
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5363/functions/parse Modified Files: end_vevent.php recur_functions.php Log Message: misc error warnings and notices Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** end_vevent.php 18 Dec 2008 09:22:23 -0000 1.9 --- end_vevent.php 20 Dec 2008 03:22:54 -0000 1.10 *************** *** 12,15 **** --- 12,17 ---- */ + if (!isset($start_date)) echo "no start date for $summary<br>"; + // Handle DURATION if (!isset($end_unixtime)) { *************** *** 133,137 **** $until = str_replace('Z', '', $until); if (strlen($until) == 8) $until = $until.'235959'; - $abs_until = $until; ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', $until, $regs); $until_unixtime = mktime($regs[4],$regs[5],@$regs[6],$regs[2],$regs[3],$regs[1]); --- 135,138 ---- *************** *** 331,335 **** // Let's double check the until to not write past it $until_check = $start_date_tmp.$time_tmp.'00'; ! if ($abs_until > $until_check) { $master_array[$start_date_tmp][$time_tmp][$uid] = array ( 'event_start' => $start_time_tmp, --- 332,336 ---- // Let's double check the until to not write past it $until_check = $start_date_tmp.$time_tmp.'00'; ! if (@$until > $until_check) { $master_array[$start_date_tmp][$time_tmp][$uid] = array ( 'event_start' => $start_time_tmp, Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** recur_functions.php 18 Dec 2008 09:22:23 -0000 1.8 --- recur_functions.php 20 Dec 2008 03:22:54 -0000 1.9 *************** *** 58,62 **** function expand_bymonth($time){ global $bymonth, $byweekno, $bymonthday, $year, $start_unixtime, $freq_type; ! if(!empty($byweekno)) return $times; if(empty($bymonth)) $bymonth = array(date("m", $start_unixtime)); $d = date("d",$start_unixtime); --- 58,62 ---- function expand_bymonth($time){ global $bymonth, $byweekno, $bymonthday, $year, $start_unixtime, $freq_type; ! if(!empty($byweekno)) return $time; if(empty($bymonth)) $bymonth = array(date("m", $start_unixtime)); $d = date("d",$start_unixtime); |