phpicalendar-commits Mailing List for PHP iCalendar (Page 18)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	end_vevent.php recur_functions.php 
Log Message:
progress on timezones and daylight time

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** end_vevent.php	24 Dec 2008 09:54:28 -0000	1.12
--- end_vevent.php	25 Dec 2008 18:45:26 -0000	1.13
***************
*** 321,325 ****
  		$start_unixtime_tmp = mktime($recur_data_hour,$recur_data_minute,0,$recur_data_month,$recur_data_day,$recur_data_year);
  		$end_unixtime_tmp = $start_unixtime_tmp + $length;
- 		
  		if (($end_time >= $phpiCal_config->bleed_time) && ($bleed_check == '-1')) {
  			$start_tmp = strtotime(date('Ymd',$start_unixtime_tmp));
--- 321,324 ----
***************
*** 340,388 ****
  					$display_end_tmp = $end_time;
  				}
! 				
! 				// 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, 
! 						'event_end' => $end_time_tmp, 
! 						'start_unixtime' => $start_unixtime_tmp, 
! 						'end_unixtime' => $end_unixtime_tmp, 
! 						'event_text' => $summary, 
! 						'event_length' => $length, 
! 						'event_overlap' => 0, 
! 						'description' => $description, 
! 						'status' => $status, 
! 						'class' => $class, 
! 						'spans_day' => true, 
! 						'location' => $location, 
! 						'organizer' => serialize($organizer), 
! 						'attendee' => serialize($attendee), 
! 						'calnumber' => $calnumber, 
! 						'calname' => $actual_calname, 
! 						'url' => $url, 
! 						'recur' => $recur);
! 					if (isset($display_end_tmp)){
! 						$master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp;
! 					}
! 					checkOverlap($start_date_tmp, $time_tmp, $uid);
! 				}
! 				$start_tmp = strtotime('+1 day',$start_tmp);
! 			}
! 		} else {
! 			if ($bleed_check == '-1') {
! 				$display_end_tmp = $end_time;
! 				$end_time_tmp1 = '2400';
! 					
! 			}
! 			if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time;
! 		
! 			// Let's double check the until to not write past it
! 				$master_array[($recur_data_date)][($hour.$minute)][$uid] = array (
! 					'event_start' => $start_time, 
! 					'event_end' => $end_time_tmp1, 
  					'start_unixtime' => $start_unixtime_tmp, 
  					'end_unixtime' => $end_unixtime_tmp, 
! 					'event_text' => $summary, 
  					'event_length' => $length, 
  					'event_overlap' => 0, 
--- 339,348 ----
  					$display_end_tmp = $end_time;
  				}
! 				$master_array[$start_date_tmp][$time_tmp][$uid] = array (
! 					'event_start' => $start_time_tmp, 
! 					'event_end' => $end_time_tmp, 
  					'start_unixtime' => $start_unixtime_tmp, 
  					'end_unixtime' => $end_unixtime_tmp, 
! 					'event_text' => $summary, #
  					'event_length' => $length, 
  					'event_overlap' => 0, 
***************
*** 390,394 ****
  					'status' => $status, 
  					'class' => $class, 
! 					'spans_day' => false, 
  					'location' => $location, 
  					'organizer' => serialize($organizer), 
--- 350,354 ----
  					'status' => $status, 
  					'class' => $class, 
! 					'spans_day' => true, 
  					'location' => $location, 
  					'organizer' => serialize($organizer), 
***************
*** 399,405 ****
  					'recur' => $recur);
  				if (isset($display_end_tmp)){
! 					$master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp;
  				}
! 				checkOverlap($recur_data_date, ($hour.$minute), $uid);
  			
  		}
--- 359,397 ----
  					'recur' => $recur);
  				if (isset($display_end_tmp)){
! 					$master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp;
  				}
! 				checkOverlap($start_date_tmp, $time_tmp, $uid);
! 				$start_tmp = strtotime('+1 day',$start_tmp);
! 			}
! 		} else {
! 			if ($bleed_check == '-1') {
! 				$display_end_tmp = $end_time;
! 				$end_time_tmp1 = '2400';
! 					
! 			}
! 			if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time;
! 				$master_array[($recur_data_date)][($hour.$minute)][$uid] = array (
! 				'event_start' => $start_time, 
! 				'event_end' => $end_time_tmp1, 
! 				'start_unixtime' => $start_unixtime_tmp, 
! 				'end_unixtime' => $end_unixtime_tmp, 
! 				'event_text' => $summary, 
! 				'event_length' => $length, 
! 				'event_overlap' => 0, 
! 				'description' => $description, 
! 				'status' => $status, 
! 				'class' => $class, 
! 				'spans_day' => false, 
! 				'location' => $location, 
! 				'organizer' => serialize($organizer), 
! 				'attendee' => serialize($attendee), 
! 				'calnumber' => $calnumber, 
! 				'calname' => $actual_calname, 
! 				'url' => $url, 
! 				'recur' => $recur);
! 			if (isset($display_end_tmp)){
! 				$master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp;
! 			}
! 			checkOverlap($recur_data_date, ($hour.$minute), $uid);
  			
  		}

Index: recur_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** recur_functions.php	24 Dec 2008 21:09:31 -0000	1.10
--- recur_functions.php	25 Dec 2008 18:45:26 -0000	1.11
***************
*** 29,32 ****
--- 29,33 ----
  	/*BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR,
     BYMINUTE, BYSECOND and BYSETPOS*/
+ #dump_times($times);
  	$times = restrict_bymonth($times,$freq); 
  #	$times = restrict_byweekno($times,$freq);
***************
*** 254,258 ****
  	echo "<pre>$summary times:";
  	#var_dump($times);
! 	foreach($times as $time) echo "\ndate:".date("Ymd his",$time);
  	echo "</pre>";
  }
--- 255,259 ----
  	echo "<pre>$summary times:";
  	#var_dump($times);
! 	foreach($times as $time) echo "\ndate:".date("Y-m-d H:i:s",$time);
  	echo "</pre>";
  }

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2003	Jan (5)	Feb (25)	Mar (18)	Apr	May (26)	Jun (14)	Jul (1)	Aug (5)	Sep (82)	Oct (3)	Nov (130)	Dec (9)
2004	Jan (4)	Feb (62)	Mar	Apr (3)	May (100)	Jun	Jul (6)	Aug (49)	Sep (33)	Oct (47)	Nov (2)	Dec (1)
2005	Jan	Feb (4)	Mar (1)	Apr (8)	May (17)	Jun	Jul (1)	Aug (2)	Sep (26)	Oct (18)	Nov (37)	Dec (14)
2006	Jan (2)	Feb (18)	Mar (34)	Apr (52)	May (7)	Jun (3)	Jul (2)	Aug (10)	Sep	Oct	Nov (18)	Dec (4)
2007	Jan	Feb (7)	Mar (7)	Apr (6)	May (52)	Jun	Jul (1)	Aug	Sep	Oct (15)	Nov	Dec (1)
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (250)
2009	Jan (35)	Feb (45)	Mar	Apr (4)	May (35)	Jun (13)	Jul (49)	Aug	Sep	Oct	Nov	Dec (11)
2010	Jan (3)	Feb (30)	Mar	Apr (35)	May (12)	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec (4)

phpicalendar-commits Mailing List for PHP iCalendar (Page 18)

phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.