[PHPiCalendar-Commits] phpicalendar/rss rss.php,1.17,1.18

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

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

Modified Files:
	rss.php 
Log Message:
Fixed most of RSS.



Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** rss.php	27 Apr 2004 20:56:57 -0000	1.17
--- rss.php	13 Aug 2004 22:51:34 -0000	1.18
***************
*** 36,44 ****
  
  if ($rssview == "day") {
! 	$theview = $day_lang;
  } elseif ($rssview == "week") {
! 	$theview = $week_lang;
  } elseif ($rssview == "month") {
! 	$theview = $month_lang;
  }
  
--- 36,44 ----
  
  if ($rssview == "day") {
! 	$theview = $lang['l_day'];
  } elseif ($rssview == "week") {
! 	$theview = $lang['l_week'];
  } elseif ($rssview == "month") {
! 	$theview = $lang['l_month'];
  }
  
***************
*** 50,56 ****
  $rss .= '<title>'.$cal_displayname.' - '.$theview.'</title>'."\n";
  $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";
! $rss .= '<description>'.$cal_displayname.' '.$calendar_lang.' - '.$theview.'</description>'."\n";
  $rss .= '<language>'.$rss_language.'</language>'."\n";
! $rss .= '<copyright>Copyright 2002, '.htmlspecialchars ("$default_path").'</copyright>'."\n";
  
  
--- 50,56 ----
  $rss .= '<title>'.$cal_displayname.' - '.$theview.'</title>'."\n";
  $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";
! $rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n";
  $rss .= '<language>'.$rss_language.'</language>'."\n";
! $rss .= '<copyright>Copyright 2004, '.htmlspecialchars ("$default_path").'</copyright>'."\n";
  
  
***************
*** 80,84 ****
  	if ($events_week < 1) {
  		$rss .= '<item>'."\n";
! 		$rss .= '<title>'.$no_events_day_lang.'</title>'."\n";
  		$rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";
  		$rss .= '</item>'."\n";
--- 80,84 ----
  	if ($events_week < 1) {
  		$rss .= '<item>'."\n";
! 		$rss .= '<title>'.$lang['l_no_events_day'].'</title>'."\n";
  		$rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";
  		$rss .= '</item>'."\n";
***************
*** 92,96 ****
  		$getdate = date("Ymd", $thisdate);
  		$dayofweek = strtotime ($getdate);
! 		$dayofweek = localizeDate ($rss_week_date, $dayofweek);
  		if (isset($master_array[($getdate)]) && sizeof($master_array[($getdate)]) > 0) {
  			foreach ($master_array[("$getdate")] as $event_times) {
--- 92,96 ----
  		$getdate = date("Ymd", $thisdate);
  		$dayofweek = strtotime ($getdate);
! 		$dayofweek = localizeDate ($dateFormat_day, $dayofweek);
  		if (isset($master_array[($getdate)]) && sizeof($master_array[($getdate)]) > 0) {
  			foreach ($master_array[("$getdate")] as $event_times) {
***************
*** 105,109 ****
  					$rss_title		= htmlspecialchars ("$dayofweek: $event_text");
  					$rss_link		= htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal");
! 					$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
  					$rss .= '<item>'."\n";
  					$rss .= '<title>'.$rss_title.'</title>'."\n";
--- 105,109 ----
  					$rss_title		= htmlspecialchars ("$dayofweek: $event_text");
  					$rss_link		= htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal");
! 					$rss_description	= htmlspecialchars ("$dayofweek $event_start: $event_text - $description");
  					$rss .= '<item>'."\n";
  					$rss .= '<title>'.$rss_title.'</title>'."\n";
***************
*** 117,121 ****
  		if (($events_week < 1) && ($i == 6)) {
  			$rss .= '<item>'."\n";
! 			$rss .= '<title>'.$no_events_week_lang.'</title>'."\n";
  			$rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";
  			$rss .= '</item>'."\n";
--- 117,121 ----
  		if (($events_week < 1) && ($i == 6)) {
  			$rss .= '<item>'."\n";
! 			$rss .= '<title>'.$lang['l_no_events_week'].'</title>'."\n";
  			$rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";
  			$rss .= '</item>'."\n";
***************
*** 134,138 ****
  			$getdate = $key;
  			$dayofmonth = strtotime ($getdate);
! 			$dayofmonth = localizeDate ($rss_month_date, $dayofmonth);
  			
  			// Pull out each day
--- 134,138 ----
  			$getdate = $key;
  			$dayofmonth = strtotime ($getdate);
! 			$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
  			
  			// Pull out each day
***************
*** 151,155 ****
  						$rss_title		= htmlspecialchars ("$dayofmonth: $event_text");
  						$rss_link		= htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal");
! 						$rss_description	= htmlspecialchars ("$dayofmonth $event_start: $description");
  						$rss .= '<item>'."\n";
  						$rss .= '<title>'.$rss_title.'</title>'."\n";
--- 151,155 ----
  						$rss_title		= htmlspecialchars ("$dayofmonth: $event_text");
  						$rss_link		= htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal");
! 						$rss_description	= htmlspecialchars ("$dayofmonth $event_start: $event_text - $description");
  						$rss .= '<item>'."\n";
  						$rss .= '<title>'.$rss_title.'</title>'."\n";
***************
*** 162,166 ****
  					if ($events_week < 1) {
  						$rss .= '<item>'."\n";
! 						$rss .= '<title>'.$no_events_month_lang.'</title>'."\n";
  						$rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";
  						$rss .= '</item>'."\n";
--- 162,166 ----
  					if ($events_week < 1) {
  						$rss .= '<item>'."\n";
! 						$rss .= '<title>'.$lang['no_events_month'].'</title>'."\n";
  						$rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";
  						$rss .= '</item>'."\n";