[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.14, 1.15 recur_functions.php, 1.12, 1.13

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6403/functions/parse

Modified Files:
	end_vevent.php recur_functions.php 
Log Message:
expand search range;fix todo display

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** end_vevent.php	26 Dec 2008 05:54:46 -0000	1.14
--- end_vevent.php	26 Dec 2008 08:26:31 -0000	1.15
***************
*** 254,257 ****
--- 254,258 ----
  #echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tnext_range_unixtime:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."\n";
  $recur_data = array();
+ if($current_view == 'search') $freq_type = 'none'; 
  while ($next_range_unixtime <= $end_range_unixtime && $count > 0) {
  	$year = date("Y", $next_range_unixtime); 

Index: recur_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** recur_functions.php	26 Dec 2008 05:54:46 -0000	1.12
--- recur_functions.php	26 Dec 2008 08:26:31 -0000	1.13
***************
*** 11,27 ****
  function add_recur($times,$freq=''){
  	global $recur_data;
! 	global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime, $day_offset;	
  	if (!is_array($times)) $times = array($times);
  	/*	BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS	*/
  #dump_times($times);
! 	$times = restrict_bymonth($times,$freq); 
! #	$times = restrict_byweekno($times,$freq);
! 	$times = restrict_byyearday($times,$freq);
! 	$times = restrict_bymonthday($times,$freq);
! 	$times = restrict_byday($times,$freq);
! 	if($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime;
! 	$times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos";
! 	$times = array_unique($times);
! 	sort($times); 
  	$until_date = date("Ymd",$end_range_unixtime);
  	foreach ($times as $time){ 
--- 11,29 ----
  function add_recur($times,$freq=''){
  	global $recur_data;
! 	global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime, $day_offset, $current_view;	
  	if (!is_array($times)) $times = array($times);
  	/*	BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS	*/
  #dump_times($times);
! 	if ($current_view != 'search'){
! 		$times = restrict_bymonth($times,$freq); 
! 	#	$times = restrict_byweekno($times,$freq);
! 		$times = restrict_byyearday($times,$freq);
! 		$times = restrict_bymonthday($times,$freq);
! 		$times = restrict_byday($times,$freq);
! 		if($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime;
! 		$times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos";
! 		$times = array_unique($times);
! 		sort($times); 
! 	}
  	$until_date = date("Ymd",$end_range_unixtime);
  	foreach ($times as $time){