add all calendars to rss index

6 files changed, 31 insertions, 28 deletions

diff --git a/functions/init/date_range.php b/functions/init/date_range.php
index 81e9190..6306c04 100644
--- a/functions/init/date_range.php
+++ b/functions/init/date_range.php
@@ -36,6 +36,7 @@ switch ($current_view){
 	case 'admin':
 	case 'error':
 	case 'preferences':
+	case 'rss_index':
 		$mArray_begin = time();
 		$mArray_end = time();
 		break;		
diff --git a/languages/english.inc.php b/languages/english.inc.php
index d2cfbc5..0db4bbe 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -36,6 +36,7 @@ $lang['l_today'] 			= 'Today';
 $lang['l_this_week'] 		= 'This Week';
 $lang['l_this_month'] 		= 'This Month';
 $lang['l_jump'] 			= 'Jump to';
+$lang['l_todays']    		= 'Today\'s Events';
 $lang['l_tomorrows'] 		= 'Tomorrow\'s Events';
 $lang['l_goday'] 			= 'Go to Today';
 $lang['l_goweek'] 			= 'Go to This Week';
diff --git a/rss/index.php b/rss/index.php
index 7f0168d..911f308 100644
--- a/rss/index.php
+++ b/rss/index.php
@@ -1,9 +1,9 @@
 <?php
 
 /* Rewritten by J. Hu 4/2/06*/
-$current_view = 'rss';
+$current_view = 'rss_index';
 define('BASE','../');
-require_once(BASE.'functions/ical_parser.php');
+require_once(BASE.'functions/init.inc.php');
 require_once(BASE.'functions/calendar_functions.php');
 
 if ($phpiCal_config->enable_rss != 'yes') {
@@ -18,40 +18,36 @@ if (empty($default_path)) {
 	}
 }
 
-$current_view = "rssindex";
+$current_view = "rss_index";
 $display_date = "RSS Info";
 
-$rss_list = "<table>\n";
+$rss_list = "<table width='90%'>\n";
 $xml_icon ="<img src = 'feed.png' alt='rss icon'>";
-
-$filelist = availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
-foreach ($filelist as $file) {
+$cals[] = '';
+$cal_displaynames[] = $all_cal_comb_lang;
+foreach ($cals as $k=>$file) {
 	// $cal_filename is the filename of the calendar without .ics
 	// $cal is a urlencoded version of $cal_filename
 	// $cal_displayname is $cal_filename with occurrences of "32" replaced with " "
-
-	if (is_numeric(array_search($file, $cal_filelist))){
-		$cal_displayname_tmp = $cal_displaynames[array_search($file,$cal_filelist)];
-	}else{
-		$cal_displayname_tmp = str_replace("32", " ", str_replace(".ics",'',basename($file)));
-	}	
-	$rss_list .= '<tr><td rowspan ="3"><font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $lang['l_calendar'].'</b></font></td>';
+	
+	$rss_list .= '<tr><td rowspan ="3"><font class="V12" color="blue"><b>'.$cal_displaynames[$k].' '. $lang['l_calendar'].'</b></font></td>';
 
 /* Changed to show links without urlencode, but links valid urls */
 	$rss_list .= "<td>".$lang['l_day']."</td>";
-	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 0.91</td>';
-	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 1.0</td>';
+	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 0.91</td><td>&nbsp;</td>';
+	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 1.0</td><td>&nbsp;</td>';
 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 2.0</td></tr>';
 
 	$rss_list .= "<td>".$lang['l_week']."</td>";
-	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 0.91</td>';
-	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 1.0</td>';
+	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 0.91</td><td>&nbsp;</td>';
+	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 1.0</td><td>&nbsp;</td>';
 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 2.0</td></tr>';
 
 	$rss_list .= "<td>".$lang['l_month']."</td>";
-	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 0.91</td>';
-	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 1.0</td>';
-	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 2.0</td></tr>';
+	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 0.91</td><td>&nbsp;</td>';
+	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 1.0</td><td>&nbsp;</td>';
+	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 2.0</td>
+	</tr>';
 
 	$footer_check = $phpiCal_config->default_path.'/rss/rss.php?cal%3D'.rawurlencode($file.'&amp;cpath='.$cpath.'&amp;rssview='.$phpiCal_config->default_view);
 	$validrss_check = str_replace('%', '%25', $footer_check);
@@ -78,7 +74,7 @@ $page->replace_tags(array(
 	'template'			=> $phpiCal_config->template,
 	'cal'				=> $cal,
 	'getdate'			=> $getdate,
-	'calendar_name'		=> $calendar_name,
+	'calendar_name'		=> $cal_displayname,
 	'display_date'		=> $display_date,
 	'current_view'		=> $current_view,
 	'sidebar_date'		=> @$sidebar_date,
diff --git a/rss/rss.php b/rss/rss.php
index 4100c61..c22f31e 100644
--- a/rss/rss.php
+++ b/rss/rss.php
@@ -11,7 +11,7 @@ $rss_version = '<rss version="0.91">'."\n";
 require(BASE.'rss/rss_common.php');
 
 function rss_top(){
-	global $cal_displayname, $theview, $default_path, $cpath, $lang, $rss_link, $rss_language;
+	global $cal_displayname, $theview, $phpiCal_config, $cpath, $lang, $rss_link, $rss_language;
 	$rss = 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"."\n";
 	$rss .= '<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN" "http://my.netscape.com/publish/formats/rss-0.91.dtd">'."\n";
 	$rss .= '<rss version="0.91">'."\n";
@@ -26,7 +26,7 @@ function rss_top(){
 	
 	$rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n";
 	$rss .= '<language>'.$rss_language.'</language>'."\n";
-	$rss .= '<copyright>Copyright '.date(Y).', '.htmlspecialchars ("$default_path").'</copyright>'."\n";
+	$rss .= '<copyright>Copyright '.date("Y").', '.htmlspecialchars ("$default_path").'</copyright>'."\n";
 	return $rss;
 }
 
diff --git a/rss/rss_common.php b/rss/rss_common.php
index 73d704f..0e94b09 100644
--- a/rss/rss_common.php
+++ b/rss/rss_common.php
@@ -45,6 +45,11 @@ switch ($rssview){
 		$todate = date("Ymd", strtotime($getdate) + 60*60*24);
 		$theview = $lang['l_day'];
 		break;
+	case 'today':
+		$fromdate = date("Ymd");
+		$todate = date("Ymd", strtotime('tomorrow'));
+		$theview = $lang['l_todays'] ;
+		break;
 	case 'tomorrow':
 		$fromdate = date("Ymd",strtotime('tomorrow'));
 		$todate = date("Ymd", strtotime('tomorrow') + 60*60*24);
diff --git a/templates/default/rss_index.tpl b/templates/default/rss_index.tpl
index 7d61389..fac312f 100644
--- a/templates/default/rss_index.tpl
+++ b/templates/default/rss_index.tpl
@@ -13,10 +13,10 @@
 									<div style="padding-top: 3px;">
 									<table width="120" border="0" cellpadding="0" cellspacing="0">
 										<tr valign="top">
-											<td><a class="psf" href="../day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td>
-											<td><a class="psf" href="../week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td>
-											<td><a class="psf" href="../month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td>
-											<td><a class="psf" href="../year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td>
+											<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
+											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
+											<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
+											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
 										</tr>
 									</table>
 									</div>