[PHPiCalendar-Commits] phpicalendar/functions date_functions.php,1.28,1.29 template.php,1.74,1.75

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

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

Modified Files:
	date_functions.php template.php 
Log Message:
Fixed bug where if the times weren't on the half-hour mark, it wouldn't pop-up correctly - now it passes the time used in the array as part of the openevent call.


Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** date_functions.php	7 Sep 2005 06:08:02 -0000	1.28
--- date_functions.php	15 Sep 2005 22:51:27 -0000	1.29
***************
*** 163,167 ****
  }
  
! function openevent($event_date, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
  	global $cpath;
  	$event_text = stripslashes(urldecode($arr["event_text"]));
--- 163,167 ----
  }
  
! function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
  	global $cpath;
  	$event_text = stripslashes(urldecode($arr["event_text"]));
***************
*** 187,192 ****
  		if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $full_event_text, $res))) || ($arr['description'])) {
  			$escaped_date = addslashes($event_date);
! 			$escaped_time = addslashes($arr['event_start']);
! 			if (!$escaped_time) $escaped_time = -1;
  			$escaped_uid = addslashes($uid);
  			// fix for URL-length bug in IE: populate and submit a hidden form on click
--- 187,191 ----
  		if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $full_event_text, $res))) || ($arr['description'])) {
  			$escaped_date = addslashes($event_date);
! 			$escaped_time = addslashes($time);
  			$escaped_uid = addslashes($uid);
  			// fix for URL-length bug in IE: populate and submit a hidden form on click

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** template.php	14 Sep 2005 20:53:53 -0000	1.74
--- template.php	15 Sep 2005 22:51:27 -0000	1.75
***************
*** 274,278 ****
  					$event_calno  	= $allday['calnumber'];
  					$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
!  					$event 			= openevent($get_date, $uid, $allday, 1, 11, 'psf');
  					$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  					$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
--- 274,278 ----
  					$event_calno  	= $allday['calnumber'];
  					$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
!  					$event 			= openevent($get_date, -1, $uid, $allday, 1, 11, 'psf');
  					$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  					$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
***************
*** 450,454 ****
  								// Start drawing the event
  								$event_temp   = $loop_event;
! 								$event 		  = openevent($thisday, $uid, $this_time_arr[$uid], $week_events_lines, 25, 'ps');
  								$event_temp   = str_replace('{EVENT}', $event, $event_temp);
  								$event_temp   = str_replace('{EVENT_START}', $event_start, $event_temp);
--- 450,454 ----
  								// Start drawing the event
  								$event_temp   = $loop_event;
! 								$event 		  = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $week_events_lines, 25, 'ps');
  								$event_temp   = str_replace('{EVENT}', $event, $event_temp);
  								$event_temp   = str_replace('{EVENT_START}', $event_start, $event_temp);
***************
*** 505,509 ****
  				$event_calno  	= $allday['calnumber'];
  				$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
!  				$event 			= openevent($getdate, $uid, $allday);
  				$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  				$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
--- 505,509 ----
  				$event_calno  	= $allday['calnumber'];
  				$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
!  				$event 			= openevent($getdate, -1, $uid, $allday);
  				$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  				$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
***************
*** 671,675 ****
  						  // Start drawing the event
  						  $event_temp  = $loop_event;
! 						  $event 	   = openevent($getdate, $uid, $this_time_arr[$uid], 0, 0, 'ps');
  						  $event_temp  = str_replace('{EVENT}', $event, $event_temp);
  						  $event_temp  = str_replace('{EVENT_START}', $event_start, $event_temp);
--- 671,675 ----
  						  // Start drawing the event
  						  $event_temp  = $loop_event;
! 						  $event 	   = openevent($getdate, $cal_time, $uid, $this_time_arr[$uid], 0, 0, 'ps');
  						  $event_temp  = str_replace('{EVENT}', $event, $event_temp);
  						  $event_temp  = str_replace('{EVENT_START}', $event_start, $event_temp);
***************
*** 728,732 ****
  
  		if (is_array($master_array[$next_day]) && sizeof($master_array[$next_day]) > 0) {
! 			foreach ($master_array[$next_day] as $event_times) {
  				foreach ($event_times as $uid => $val) {
  					$event_text = stripslashes(urldecode($val["event_text"]));
--- 728,732 ----
  
  		if (is_array($master_array[$next_day]) && sizeof($master_array[$next_day]) > 0) {
! 			foreach ($master_array[$next_day] as $cal_time => $event_times) {
  				foreach ($event_times as $uid => $val) {
  					$event_text = stripslashes(urldecode($val["event_text"]));
***************
*** 734,741 ****
  					if ($event_text != "") {
  						if (!isset($val["event_start"])) {
! 							$return_adtmp = openevent($next_day, $uid, $val, $tomorrows_events_lines, 21, 'psf');
  							$replace_ad  .= str_replace('{T_ALLDAY}', $return_adtmp, $loop_t_ad);
  						} else {
! 							$return_etmp  = openevent($next_day, $uid, $val, $tomorrows_events_lines, 21, 'ps3');
  							$replace_e   .= str_replace('{T_EVENT}', $return_etmp, $loop_t_e);
  						}
--- 734,741 ----
  					if ($event_text != "") {
  						if (!isset($val["event_start"])) {
! 							$return_adtmp = openevent($next_day, $cal_time, $uid, $val, $tomorrows_events_lines, 21, 'psf');
  							$replace_ad  .= str_replace('{T_ALLDAY}', $return_adtmp, $loop_t_ad);
  						} else {
! 							$return_etmp  = openevent($next_day, $cal_time, $uid, $val, $tomorrows_events_lines, 21, 'ps3');
  							$replace_e   .= str_replace('{T_EVENT}', $return_etmp, $loop_t_e);
  						}
***************
*** 905,909 ****
  			if ($master_array[$daylink]) {
  				if ($type != 'small') {
! 					foreach ($master_array[$daylink] as $event_times) {
  						foreach ($event_times as $uid => $val) {
  							$event_calno 	= $val['calnumber'];
--- 905,909 ----
  			if ($master_array[$daylink]) {
  				if ($type != 'small') {
! 					foreach ($master_array[$daylink] as $cal_time => $event_times) {
  						foreach ($event_times as $uid => $val) {
  							$event_calno 	= $val['calnumber'];
***************
*** 912,916 ****
  								if ($type == 'large') {
  									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
!  									$switch['ALLDAY'] .= openevent($daylink, $uid, $val, $month_event_lines, 15, 'psf');
  									$switch['ALLDAY'] .= '</div>';
  								} else {
--- 912,916 ----
  								if ($type == 'large') {
  									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
!  									$switch['ALLDAY'] .= openevent($daylink, $cal_time, $uid, $val, $month_event_lines, 15, 'psf');
  									$switch['ALLDAY'] .= '</div>';
  								} else {
***************
*** 921,925 ****
  								if ($type == 'large') {
  									$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
!  									$switch['EVENT'] .= openevent($daylink, $uid, $val, $month_event_lines, 10, 'ps3', "$start2 ").'<br />';
  									$switch['EVENT'] .= '</div>';
  								} else {
--- 921,925 ----
  								if ($type == 'large') {
  									$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
!  									$switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $month_event_lines, 10, 'ps3', "$start2 ").'<br />';
  									$switch['EVENT'] .= '</div>';
  								} else {
***************
*** 981,985 ****
  		do {
  			if (isset($master_array[$m_start])) {
! 				foreach ($master_array[$m_start] as $event_times) {
  					$switch['CAL'] 			= $cal;
  					$switch['START_DATE'] 	= localizeDate ($dateFormat_week_list, $u_start);
--- 981,985 ----
  		do {
  			if (isset($master_array[$m_start])) {
! 				foreach ($master_array[$m_start] as $cal_time => $event_times) {
  					$switch['CAL'] 			= $cal;
  					$switch['START_DATE'] 	= localizeDate ($dateFormat_week_list, $u_start);
***************
*** 988,992 ****
  						if (!isset($val['event_start'])) {
  							$switch['START_TIME'] 	= $lang['l_all_day'];
! 							$switch['EVENT_TEXT'] 	= openevent($m_start, $uid, $val, $month_event_lines, 15, 'psf');
  							$switch['DESCRIPTION'] 	= urldecode($val['description']);
  						} else {
--- 988,992 ----
  						if (!isset($val['event_start'])) {
  							$switch['START_TIME'] 	= $lang['l_all_day'];
! 							$switch['EVENT_TEXT'] 	= openevent($m_start, $cal_time, $uid, $val, $month_event_lines, 15, 'psf');
  							$switch['DESCRIPTION'] 	= urldecode($val['description']);
  						} else {
***************
*** 996,1000 ****
  							$event_end   = date($timeFormat, @strtotime ($event_end));
  							$switch['START_TIME'] 	= $event_start . ' - ' . $event_end;
! 							$switch['EVENT_TEXT'] 	= openevent($m_start, $uid, $val, 0, 15, 'psf');
  							$switch['DESCRIPTION'] 	= urldecode($val['description']);
  						}
--- 996,1000 ----
  							$event_end   = date($timeFormat, @strtotime ($event_end));
  							$switch['START_TIME'] 	= $event_start . ' - ' . $event_end;
! 							$switch['EVENT_TEXT'] 	= openevent($m_start, $cal_time, $uid, $val, 0, 15, 'psf');
  							$switch['DESCRIPTION'] 	= urldecode($val['description']);
  						}