[PHPiCalendar-Commits] phpicalendar/functions template.php,1.69,1.70

[<da...@us...>]

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

Modified Files:
	template.php 
Log Message:
SF Patch #1043823 - a modified version of the patch was applied so there wasn't a need for a new function, and it also simplified the code. Update the config text to make more sense, but we should note things in the README when we release 2.0.



Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** template.php	6 May 2005 19:04:06 -0000	1.69
--- template.php	7 May 2005 00:22:24 -0000	1.70
***************
*** 274,278 ****
  					$event_calna  	= $allday['calname'];
  					$event_url	   	= $allday['url'];
! 					if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors);
  					$event 			= openevent($event_calna, '', '', $allday, 1, 11, '', '', 'psf', $event_url);
  					$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
--- 274,278 ----
  					$event_calna  	= $allday['calname'];
  					$event_url	   	= $allday['url'];
! 					$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
  					$event 			= openevent($event_calna, '', '', $allday, 1, 11, '', '', 'psf', $event_url);
  					$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
***************
*** 437,441 ****
  								$event_url  	= $this_time_arr[($event_length[$thisday][$i]['key'])]['url'];
  								$event_status	= strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']);
! 								if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors);
  								if ($event_status != '') {
  						  			$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
--- 437,441 ----
  								$event_url  	= $this_time_arr[($event_length[$thisday][$i]['key'])]['url'];
  								$event_status	= strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']);
! 								$event_calno = (($event_calno - 1) % $unique_colors) + 1;
  								if ($event_status != '') {
  						  			$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
***************
*** 502,506 ****
  				$event_calna  	= $allday['calname'];
  				$event_url	   	= $allday['url'];
! 				if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors);
  				$event 			= openevent($event_calna, '', '', $allday, 0, '', '', '', '', $event_url);
  				$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
--- 502,506 ----
  				$event_calna  	= $allday['calname'];
  				$event_url	   	= $allday['url'];
! 				$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
  				$event 			= openevent($event_calna, '', '', $allday, 0, '', '', '', '', $event_url);
  				$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
***************
*** 651,655 ****
  						  $event_recur  = $this_time_arr[($event_length[$i]['key'])]['recur'];
  						  $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']);
! 						  if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors);
  						  if ($event_status != '') {
  						  	$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
--- 651,655 ----
  						  $event_recur  = $this_time_arr[($event_length[$i]['key'])]['recur'];
  						  $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']);
! 						  $event_calno  = (($event_calno - 1) % $unique_colors) + 1;
  						  if ($event_status != '') {
  						  	$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
***************
*** 900,904 ****
  						foreach ($event_times as $val) {
  							$event_calno 	= $val['calnumber'];
! 							if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors);
  							$event_calna 	= $val['calname'];
  							$event_url 		= $val['url'];
--- 900,904 ----
  						foreach ($event_times as $val) {
  							$event_calno 	= $val['calnumber'];
! 							$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
  							$event_calna 	= $val['calname'];
  							$event_url 		= $val['url'];