[PHPiCalendar-Commits] phpicalendar/rss rss.php,1.26,1.27

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

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

Modified Files:
	rss.php 
Log Message:
Updated incorrectly built RSS (now validates).



Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** rss.php	15 May 2005 07:17:49 -0000	1.26
--- rss.php	5 Oct 2005 00:29:13 -0000	1.27
***************
*** 28,32 ****
  		$fromdate = $getdate;
  		$todate = $getdate;
! 		$theview = $day_lang;
  		break;
  	case 'month':
--- 28,32 ----
  		$fromdate = $getdate;
  		$todate = $getdate;
! 		$theview = $lang['l_day'];
  		break;
  	case 'month':
***************
*** 120,124 ****
  			foreach ($event_times as $val) {
  				if(!$val["event_start"]){
! 					$event_start = "all day";
  				}else{	
  					$event_start 	= @$val["event_start"];	
--- 120,124 ----
  			foreach ($event_times as $val) {
  				if(!$val["event_start"]){
! 					$event_start = "All Day";
  				}else{	
  					$event_start 	= @$val["event_start"];	
***************
*** 129,133 ****
  				$event_text		= str_replace('&','&',$event_text);
  				$event_text		= str_replace('&','&',$event_text);
- 				$event_text		= urlencode($event_text);
  			#uncomment for shorter event text with ...
  			#	$event_text 	= word_wrap($event_text, 21, $tomorrows_events_lines); 		
--- 129,132 ----
***************
*** 140,149 ****
  				$rss_title		= htmlspecialchars ("$dayofweek: $event_text");
  				$rss_link		= htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal&cpath=$cpath");
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
  				
  				$rss .= '<item>'."\n";
- 				$rss .= '<event_start>'.$event_start.'</event_start>'."\n";
  				$rss .= '<title>'.$rss_title.'</title>'."\n";
! 				
  				$rss .= '<seminardate>'.$dayofweek.'</seminardate>'."\n";
  				$rss .= '<seminarspeaker>'.$event_text.'</seminarspeaker>'."\n";
--- 139,149 ----
  				$rss_title		= htmlspecialchars ("$dayofweek: $event_text");
  				$rss_link		= htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal&cpath=$cpath");
+ 				if ($description == '') $description = $event_text;
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
  				
  				$rss .= '<item>'."\n";
  				$rss .= '<title>'.$rss_title.'</title>'."\n";
! 				/*
! 				$rss .= '<event_start>'.$event_start.'</event_start>'."\n";
  				$rss .= '<seminardate>'.$dayofweek.'</seminardate>'."\n";
  				$rss .= '<seminarspeaker>'.$event_text.'</seminarspeaker>'."\n";
***************
*** 153,164 ****
  				$rss .= '<organizer>'.$val['organizer'].'</organizer>'."\n";
  				$rss .= '<status>'.$val['status'].'</status>'."\n";
- 
- 				$rss .= '<link>'.$rss_link.'</link>'."\n";
- 				$rss .= '<description>'.$rss_description.'</description>'."\n";
  				$location		= str_replace('&','&amp;',$val['location']);
  				$location		= str_replace('&amp;amp;','&amp;',$location);
- 
- 
  				$rss .= '<location>'.$location.'</location>';
  				$rss .= '</item>'."\n";
  				$events_count++;
--- 153,162 ----
  				$rss .= '<organizer>'.$val['organizer'].'</organizer>'."\n";
  				$rss .= '<status>'.$val['status'].'</status>'."\n";
  				$location		= str_replace('&','&amp;',$val['location']);
  				$location		= str_replace('&amp;amp;','&amp;',$location);
  				$rss .= '<location>'.$location.'</location>';
+ 				*/
+ 				$rss .= '<link>'.$rss_link.'</link>'."\n";
+ 				$rss .= '<description>'.$rss_description.'</description>'."\n";
  				$rss .= '</item>'."\n";
  				$events_count++;