Updated incorrectly built RSS (now validates).

4 files changed, 16 insertions, 16 deletions

diff --git a/README b/README
index 149791e..f9a4349 100644
--- a/README
+++ b/README
@@ -81,11 +81,13 @@ COPYING for more information about our license.
 
 Changes:
 --------
-2.0.2
+2.1
+	-RSS feeds display as previously indended.
 	-Updated languages: Finnish
 	-Todo popup respects CHARSET
 	-Allows multiple calendar selection.
 	-Search box can be made to go away.
+	-Fix for occasionally broken popups.
 	-Various bug fixes.
 
 2.0.1	
diff --git a/functions/init.inc.php b/functions/init.inc.php
index b5f0018..2cec049 100644
--- a/functions/init.inc.php
+++ b/functions/init.inc.php
@@ -1,7 +1,7 @@
 <?php 
 
 // uncomment when developing, comment for shipping version
-error_reporting (E_ERROR | E_WARNING | E_PARSE);
+//error_reporting (E_ERROR | E_WARNING | E_PARSE);
 
 // Older versions of PHP do not define $_SERVER. Define it here instead.
 if (!isset($_SERVER) && isset($_SERVER)) {
@@ -48,10 +48,10 @@ if ($action == 'logout' || $invalid_login) {
 
 // language support
 $language = strtolower($language);
-$lang_file = BASE.'/languages/'.$language.'.inc.php';
+$lang_file = BASE.'languages/'.$language.'.inc.php';
 
-if (file_exists(realpath($lang_file))) {
-	unset($lang);
+unset($lang);
+if (include($lang_file)) {
 	include($lang_file);
 } else {
 	exit(error('The requested language "'.$language.'" is not a supported language. Please use the configuration file to choose a supported language.'));
diff --git a/rss/rss.php b/rss/rss.php
index 84e0de2..4ed6ee9 100644
--- a/rss/rss.php
+++ b/rss/rss.php
@@ -27,7 +27,7 @@ switch ($rssview){
 	case 'day':
 		$fromdate = $getdate;
 		$todate = $getdate;
-		$theview = $day_lang;
+		$theview = $lang['l_day'];
 		break;
 	case 'month':
 		$parse_month = date ("Ym", strtotime($getdate));
@@ -119,7 +119,7 @@ $i = 0;  #day counter
 		foreach ($master_array[("$thisdate")] as $event_times) {
 			foreach ($event_times as $val) {
 				if(!$val["event_start"]){
-					$event_start = "all day";
+					$event_start = "All Day";
 				}else{	
 					$event_start 	= @$val["event_start"];	
 					$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
@@ -128,7 +128,6 @@ $i = 0;  #day counter
 				$event_text 	= strip_tags($event_text, '<b><i><u>');
 				$event_text		= str_replace('&','&amp;',$event_text);
 				$event_text		= str_replace('&amp;amp;','&amp;',$event_text);
-				$event_text		= urlencode($event_text);
 			#uncomment for shorter event text with ...
 			#	$event_text 	= word_wrap($event_text, 21, $tomorrows_events_lines); 		
 				$description 	= stripslashes(urldecode($val["description"]));
@@ -139,12 +138,13 @@ $i = 0;  #day counter
 
 				$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 .= '<event_start>'.$event_start.'</event_start>'."\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";
 				$rss .= '<seminartitle>'.$description.'</seminartitle>'."\n";
@@ -152,14 +152,12 @@ $i = 0;  #day counter
 				$rss .= '<seminarhost>'.$val['attendee'].'</seminarhost>'."\n";
 				$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 .= '<link>'.$rss_link.'</link>'."\n";
+				$rss .= '<description>'.$rss_description.'</description>'."\n";
 				$rss .= '</item>'."\n";
 				$events_count++;
 			}
diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index bd5256e..e4d0169 100644
--- a/templates/default/footer.tpl
+++ b/templates/default/footer.tpl
@@ -1,4 +1,4 @@
-<center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.0.1</a><br />
+<center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.1</a><br />
 <!-- switch rss_valid on -->
 <p>
 <a style="color:gray" href="http://feeds.archive.org/validator/check?url={FOOTER_CHECK}">