[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.157,1.158 list_functions.php,1.4,1.5 template.php,1.35,1.36

[<cl...@us...>]

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

Modified Files:
	ical_parser.php list_functions.php template.php 
Log Message:
Moving files to valid XHTML.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** ical_parser.php	13 May 2004 18:23:38 -0000	1.157
--- ical_parser.php	15 May 2004 02:42:14 -0000	1.158
***************
*** 935,940 ****
  						
  					case 'SUMMARY':
! 						$data = str_replace("\\n", "<br>", $data);
! 						$data = str_replace("\\r", "<br>", $data);
  						$data = htmlentities(urlencode($data));
  						if ($valarm_set == FALSE) { 
--- 935,940 ----
  						
  					case 'SUMMARY':
! 						$data = str_replace("\\n", "<br />", $data);
! 						$data = str_replace("\\r", "<br />", $data);
  						$data = htmlentities(urlencode($data));
  						if ($valarm_set == FALSE) { 
***************
*** 946,951 ****
  						
  					case 'DESCRIPTION':
! 						$data = str_replace("\\n", "<br>", $data);
! 						$data = str_replace("\\r", "<br>", $data);
  						$data = htmlentities(urlencode($data));
  						if ($valarm_set == FALSE) { 
--- 946,951 ----
  						
  					case 'DESCRIPTION':
! 						$data = str_replace("\\n", "<br />", $data);
! 						$data = str_replace("\\r", "<br />", $data);
  						$data = htmlentities(urlencode($data));
  						if ($valarm_set == FALSE) { 
***************
*** 1042,1047 ****
  						break;
  					case 'LOCATION':
! 						$data = str_replace("\\n", "<br>", $data);
! 						$data = str_replace("\\r", "<br>", $data);
  						$location = $data;
  						break;
--- 1042,1047 ----
  						break;
  					case 'LOCATION':
! 						$data = str_replace("\\n", "<br />", $data);
! 						$data = str_replace("\\r", "<br />", $data);
  						$location = $data;
  						break;

Index: list_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** list_functions.php	5 Feb 2004 07:06:11 -0000	1.4
--- list_functions.php	15 May 2004 02:42:15 -0000	1.5
***************
*** 15,19 ****
  	global $template, $master_array;
  	foreach ($master_array[-3] as $key => $val) {
! 		$return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br>';
  	}
  	
--- 15,19 ----
  	global $template, $master_array;
  	foreach ($master_array[-3] as $key => $val) {
! 		$return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br />';
  	}
  	

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** template.php	14 May 2004 22:36:52 -0000	1.35
--- template.php	15 May 2004 02:42:15 -0000	1.36
***************
*** 247,251 ****
  								if ($event_calno > 7) $event_calno = 7;
  								if ($event_status != '') {
! 						  			$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">&nbsp;';
  						  		}
  								$weekdisplay .= '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
--- 247,251 ----
  								if ($event_calno > 7) $event_calno = 7;
  								if ($event_status != '') {
! 						  			$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
  						  		}
  								$weekdisplay .= '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
***************
*** 262,268 ****
  								$event_temp   = str_replace('{EVENT}', $event, $event_temp);
  								$event_temp   = str_replace('{EVENT_START}', $event_start, $event_temp);
! \								$event_temp   = str_replace('{CONFIRMED}', $confirmed, $event_temp);
  								$event_temp   = str_replace('{EVENT_CALNO}', $event_calno, $event_temp);
  								$weekdisplay .= $event_temp;
  								// End event drawing
  						  
--- 262,269 ----
  								$event_temp   = str_replace('{EVENT}', $event, $event_temp);
  								$event_temp   = str_replace('{EVENT_START}', $event_start, $event_temp);
! 								$event_temp   = str_replace('{CONFIRMED}', $confirmed, $event_temp);
  								$event_temp   = str_replace('{EVENT_CALNO}', $event_calno, $event_temp);
  								$weekdisplay .= $event_temp;
+ 								$weekdisplay .= '</td>';
  								// End event drawing
  						  
***************
*** 463,469 ****
  						  if ($event_calno > 7) $event_calno = 7;
  						  if ($event_status != '') {
! 						  	$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">&nbsp;';
  						  } elseif (is_array($event_recur)) {
! 						  	$confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">&nbsp;';
  						  }
  						  $colspan_width = round((460 / $nbrGridCols) * $drawWidth);
--- 464,470 ----
  						  if ($event_calno > 7) $event_calno = 7;
  						  if ($event_status != '') {
! 						  	$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
  						  } elseif (is_array($event_recur)) {
! 						  	$confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
  						  }
  						  $colspan_width = round((460 / $nbrGridCols) * $drawWidth);
***************
*** 481,484 ****
--- 482,486 ----
  						  $event_temp   = str_replace('{EVENT_CALNO}', $event_calno, $event_temp);
  						  $daydisplay .= $event_temp;
+ 						  $daydisplay .= '</td>';
  						  // End event drawing
  						  
***************
*** 595,599 ****
  
  						$vtodo_array 	= base64_encode(serialize($vtodo_array));
! 						$vtodo_text 	= word_wrap(strip_tags(str_replace('<br>',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines);
  						$data 			= array ('{VTODO_TEXT}', '{VTODO_ARRAY}');
  						$rep			= array ($vtodo_text, $vtodo_array);
--- 597,601 ----
  
  						$vtodo_array 	= base64_encode(serialize($vtodo_array));
! 						$vtodo_text 	= word_wrap(strip_tags(str_replace('<br />',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines);
  						$data 			= array ('{VTODO_TEXT}', '{VTODO_ARRAY}');
  						$rep			= array ($vtodo_text, $vtodo_array);
***************
*** 708,716 ****
  							if (!isset($val['event_start'])) {
  								if ($type == 'large') {
! 									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">';
  									$switch['ALLDAY'] .= openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url);
  									$switch['ALLDAY'] .= '</div>';
  								} else {
! 									$switch['ALLDAY'] .= '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0">';
  								}
  							} else {	
--- 710,718 ----
  							if (!isset($val['event_start'])) {
  								if ($type == 'large') {
! 									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0" />';
  									$switch['ALLDAY'] .= openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url);
  									$switch['ALLDAY'] .= '</div>';
  								} else {
! 									$switch['ALLDAY'] .= '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0" />';
  								}
  							} else {	
***************
*** 721,729 ****
  								$event_end   = date($timeFormat, @strtotime ($event_end));
  								if ($type == 'large') {
! 									$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">';
! 									$switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'<br>';
  									$switch['EVENT'] .= '</div>';
  								} else {
! 									$switch['EVENT'] = '<img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0">';
  								}
  							}
--- 723,731 ----
  								$event_end   = date($timeFormat, @strtotime ($event_end));
  								if ($type == 'large') {
! 									$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0" />';
! 									$switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'<br />';
  									$switch['EVENT'] .= '</div>';
  								} else {
! 									$switch['EVENT'] = '<img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0" />';
  								}
  							}