[PHPiCalendar-Commits] phpicalendar/functions template.php,1.65,1.66

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8208/phpicalendar/functions

Modified Files:
	template.php 
Log Message:
Bug fixes for draw_search (exceptions), draw_week and draw_day(fix display order for events starting before day start)

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** template.php	16 Apr 2005 20:39:00 -0000	1.65
--- template.php	4 May 2005 05:36:31 -0000	1.66
***************
*** 142,145 ****
--- 142,146 ----
  				$event_text 	= stripslashes(urldecode($val['event_text']));
  				$description 	= stripslashes(urldecode($val['description']));
+ 					$location 	= stripslashes(urldecode($val['location']));
  				$event_start 	= $val['event_start'];
  				$event_end 		= $val['event_end'];
***************
*** 159,163 ****
  					$events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp);
  				}
! 					if (!$val['exception'] || !isset($val['exceptions'])) {
  					$events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!is', '', $events_tmp);
  				}else{
--- 160,164 ----
  					$events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp);
  				}
! 					if (!isset($val['exceptions'])) {
  					$events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!is', '', $events_tmp);
  				}else{
***************
*** 165,173 ****
  						foreach ($val['exceptions'] as $except_val){
  							$except_tmp	= $loop_except;
  							$except_date = strtotime($except_val['date']);
  							$except_date = localizeDate ('%A, %B %e %Y', $except_date);
- 
  							$except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp);
! 							$except_tmp = str_replace('{EXCEPT_DESCRIPTION}', stripslashes(urldecode($except_val['event_text'])), $except_tmp);
  							if (!$except_val['recur']) {
  								$except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!is', '', $except_tmp);
--- 166,184 ----
  						foreach ($val['exceptions'] as $except_val){
  							$except_tmp	= $loop_except;
+ 							
  							$except_date = strtotime($except_val['date']);
  							$except_date = localizeDate ('%A, %B %e %Y', $except_date);
  							$except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp);
! 
! 							$except_event_start    	= date ($timeFormat, strtotime ($except_val['event_start']));
! 							$except_event_end    	= date ($timeFormat, strtotime ($except_val['event_end']));
! 							$except_event_start    	= $except_event_start .' - '.$except_event_end;
! 
! 							$except_tmp = str_replace('{EVENT_START}', $except_event_start, $except_tmp);
! 
! 							$except_event_text 	= stripslashes(urldecode($except_val['event_text']));
! 							$except_tmp = str_replace('{EVENT_TEXT}', $except_event_text, $except_tmp);
! 
! 							#is there a recur in the exception?
  							if (!$except_val['recur']) {
  								$except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!is', '', $except_tmp);
***************
*** 175,178 ****
--- 186,196 ----
  								$except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp);
  							}
+ 							#is there a description in the exception?
+ 							if (!$except_val['description']) {
+ 								$except_tmp = preg_replace('!<\!-- switch except_description on -->(.*)<\!-- switch except_description off -->!is', '', $except_tmp);
+ 							}else{
+ 								$except_description = stripslashes(urldecode($except_val['description']));
+ 								$except_tmp = str_replace('{EXCEPT_DESCRIPTION}', $except_description, $except_tmp);
+ 							}
  							$some_exceptions .= $except_tmp;
  	
***************
*** 189,194 ****
  				}
  				
! 				$search		= array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}');
! 				$replace	= array($event_start, $event_text, $description);
  				$events_tmp = str_replace($search, $replace, $events_tmp);
  				$some_events .= $events_tmp;
--- 207,212 ----
  				}
  				
! 					$search		= array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}','{LOCATION}');
! 					$replace	= array($event_start, $event_text, $description, $location);
  				$events_tmp = str_replace($search, $replace, $events_tmp);
  				$some_events .= $events_tmp;
***************
*** 348,358 ****
  				$dayborder = 0;
  				unset($this_time_arr);
- 				if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) {
- 					$this_time_arr = $master_array[$thisday][$cal_time];
- 				}
  					
  				if ($day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) {
  					foreach($master_array[$thisday] as $time_key => $time_arr) {
! 						if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
  							foreach($time_arr as $event_tmp) {
  								if ((int)$event_tmp['event_end'] > (int)$cal_time) {
--- 366,373 ----
  				$dayborder = 0;
  				unset($this_time_arr);
  					
  				if ($day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) {
  					foreach($master_array[$thisday] as $time_key => $time_arr) {
! 						if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
  							foreach($time_arr as $event_tmp) {
  								if ((int)$event_tmp['event_end'] > (int)$cal_time) {
***************
*** 364,372 ****
  						}
  					}
  				}
- 				
  				
  				// check for eventstart 
  				if (isset($this_time_arr) && sizeof($this_time_arr) > 0) {
  					foreach ($this_time_arr as $eventKey => $loopevent) {
  						$drawEvent = drawEventTimes ($cal_time, $loopevent["event_end"]);
--- 379,394 ----
  						}
  					}
+ 				}else{
+ 				if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) {
+ 					$this_time_arr = $master_array[$thisday][$cal_time];
+ 				}
  				}
  				
  				// check for eventstart 
  				if (isset($this_time_arr) && sizeof($this_time_arr) > 0) {
+ 					#print "<pre>";
+ 					#print_r ($this_time_arr);
+ 					#print "</pre>";
+ 
  					foreach ($this_time_arr as $eventKey => $loopevent) {
  						$drawEvent = drawEventTimes ($cal_time, $loopevent["event_end"]);
***************
*** 549,561 ****
  			unset($this_time_arr);
  			
- 			// add events that overlap the start time
- 			if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) {
- 				$this_time_arr = $master_array[$getdate][$cal_time];
- 			}
  			
  			// add events that overlap $day_start instead of cutting them out completely
  			if (($day_start == $cal_time) && (isset($master_array[$getdate]))) {
  				foreach($master_array[$getdate] as $time_key => $time_arr) {
! 					if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
  						foreach($time_arr as $event_tmp) {
  							if ((int)$event_tmp['event_end'] > (int)$cal_time) {
--- 571,579 ----
  			unset($this_time_arr);
  			
  			
  			// add events that overlap $day_start instead of cutting them out completely
  			if (($day_start == $cal_time) && (isset($master_array[$getdate]))) {
  				foreach($master_array[$getdate] as $time_key => $time_arr) {
! 					if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
  						foreach($time_arr as $event_tmp) {
  							if ((int)$event_tmp['event_end'] > (int)$cal_time) {
***************
*** 567,570 ****
--- 585,593 ----
  					}
  				}
+ 			}else{
+ 			// add events that overlap the start time
+ 			if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) {
+ 				$this_time_arr = $master_array[$getdate][$cal_time];
+ 			}
  			}