Added RSS check, updated month for XHTML validation.

6 files changed, 24 insertions, 32 deletions

diff --git a/functions/template.php b/functions/template.php
index 561787b..7f79b3a 100644
--- a/functions/template.php
+++ b/functions/template.php
@@ -867,7 +867,7 @@ class Page {
 		}
 	
 	function output() {
-		global $template, $php_started, $lang;
+		global $template, $php_started, $lang, $enable_rss;
 		
 		// Looks for {MONTH} before sending page out
 		preg_match_all ('!\{MONTH_([A-Z]*)\|?([+|-])([0-9]{1,2})\}!is', $this->page, $match);
@@ -901,6 +901,11 @@ class Page {
 		$php_ended = @getmicrotime();
 		$generated = number_format(($php_ended-$php_started),3);
 		$this->page = str_replace('{GENERATED}', $generated, $this->page);
+		if ($enable_rss != 'yes') {
+		$this->page = preg_replace('!<\!-- switch rss_powered on -->(.*)<\!-- switch rss_powered off -->!is', '', $this->page);
+		} else {
+			$this->page = str_replace('{BASE}', BASE, $this->page);
+		}
 		print($this->page);
 	}
 }
diff --git a/month.php b/month.php
index 1f7fc9b..c45eb78 100644
--- a/month.php
+++ b/month.php
@@ -75,6 +75,7 @@ $page->replace_tags(array(
 	'list_months' 		=> $list_months,
 	'list_weeks' 		=> $list_weeks,
 	'legend'	 		=> $list_calcolors,
+	'current_view'		=> $current_view,
 	'style_select' 		=> $style_select			
 	));
 	
diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl
index 2830b79..b682ba3 100644
--- a/templates/default/calendar_nav.tpl
+++ b/templates/default/calendar_nav.tpl
@@ -15,13 +15,13 @@
 				<tr>
 					<td width="160" valign="top">
 						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr height="20">
-								<td align="center" class="sideback"><b>{L_JUMP}</b></td>
+							<tr>
+								<td align="center" class="sideback"><div style="height:20px;"><b>{L_JUMP}</b></div></td>
 							</tr>
 							<tr>
 								<td>
 									<div style="padding: 5px;">
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="GET">
+										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
 											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
 											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
 											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
@@ -32,7 +32,7 @@
 										{SEARCH_BOX}
 										<!-- switch show_search off -->
 										<!-- switch show_goto on -->
-										<form style="margin-bottom:0;" action="day.php" method="GET">
+										<form style="margin-bottom:0;" action="day.php" method="get">
 											<input type="hidden" name="cal" value="{URL_CAL}">
 											<input type="text" style="width:160px; font-size:10px" name="jumpto_day">
 											<input type="submit" value="Go">
@@ -55,8 +55,8 @@
 					</td>
 					<td width="160" valign="top">
 						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr height="20">
-								<td align="center" class="sideback"><b>{CALENDAR_NAME}</b></td>
+							<tr>
+								<td align="center" class="sideback"><div style="height:20px;"><b>{CALENDAR_NAME}</b></div></td>
 							</tr>
 							<tr>
 								<td>
diff --git a/templates/default/default.css b/templates/default/default.css
index 584c6e8..ca922c2 100644
--- a/templates/default/default.css
+++ b/templates/default/default.css
@@ -49,20 +49,6 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .eventborder	{ background-image: url(images/day_title.gif); border: 1px #006699 solid; }

 .eventbg	 	{ background-color: #6699CC; }

 

-

-/*.eventbg2 	 	{ background-color: #6699CC; border-right: 1px solid #fff; }*/

-

-

-.eventbg2week 	{ background-color: #6699CC; border-right: 1px solid #A1A5A9; }

-

-.eventbg2week_1	 	{ background-color: #6699CC; border-right: 1px solid #A1A5A9; }

-.eventbg2week_2	 	{ background-color: #666699; border-right: 1px solid #A1A5A9; }

-.eventbg2week_3	 	{ background-color: #999999; border-right: 1px solid #A1A5A9; }

-.eventbg2week_4	 	{ background-color: #6B84C7; border-right: 1px solid #A1A5A9; }

-.eventbg2week_5	 	{ background-color: #9999CC; border-right: 1px solid #A1A5A9; }

-.eventbg2week_6	 	{ background-color: #6876E7; border-right: 1px solid #A1A5A9; }

-.eventbg2week_7	 	{ background-color: #73738C; border-right: 1px solid #A1A5A9; }

-

 .calborder 		{ background-color: #fff; border: 1px #A1A5A9 solid; }

 .dateback		{ background-color: #eee; }

 .weekborder 	{ border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; }

@@ -72,9 +58,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .navback 		{ background-image: url(images/time_bg.gif); }

 .sideback 		{ background-image: url(images/side_bg.gif); }

 .monthback		{ background-color: #A1A5A9; }

-.monthreg		{ background-color: #FFFFFF; }

-.monthoff		{ background-color: #F2F2F2; }

-.monthon		{ background-color: #F2F9FF; }

+.monthreg		{ background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; }

+.monthoff		{ background-color: #F2F2F2; height: 105px; width: 105px; text-align: left;  vertical-align: top; }

+.monthon		{ background-color: #F2F9FF; height: 105px; width: 105px; text-align: left;  vertical-align: top; }

 .montheventtop	{ background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; }

 .montheventline	{ border-right: 1px dotted #A1A5A9; }

 .yearmonth		{ background: #CCCCCC; }

diff --git a/templates/default/month.tpl b/templates/default/month.tpl
index 5d457d6..8b4f0f9 100644
--- a/templates/default/month.tpl
+++ b/templates/default/month.tpl
@@ -2,7 +2,7 @@
 <center>
 	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
 		<tr>
-			<td align="center" valign="middle" bgcolor="white">
+			<td align="center" valign="middle">
 				<table width="100%" border="0" cellspacing="0" cellpadding="0">
 					<tr valign="top">
 						<td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{DISPLAY_DATE}</span><br /><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></div></td>
@@ -41,7 +41,7 @@
 				<table width="100%" border="0" cellspacing="0" cellpadding="0">
 					<tr>
 						<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td>
-						<td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20">{L_THIS_MONTHS}</font></td>
+						<td align="center" width="20%" class="navback" nowrap="nowrap" valign="middle"><font class="H20">{L_THIS_MONTHS}</font></td>
 						<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td>
 					</tr>
 				</table>
@@ -52,7 +52,7 @@
 				<table width="100%" cellspacing="1" cellpadding="4" border="0">
 					<!-- loop showbottomevents_odd on -->
 					<tr align="left" valign="top">
-						<td width="170" nowrap>
+						<td width="170" nowrap="nowrap">
 							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
 							<span class="V9G">{START_TIME}</span>
 						</td>
@@ -63,7 +63,7 @@
 					<!-- loop showbottomevents_odd off -->
 					<!-- loop showbottomevents_even on -->
 					<tr align="left" valign="top">
-						<td width="170" nowrap bgcolor="#EEEEEE">
+						<td width="170" nowrap="nowrap" bgcolor="#EEEEEE">
 							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
 							<span class="V9G">{START_TIME}</span>
 						</td>
diff --git a/templates/default/month_large.tpl b/templates/default/month_large.tpl
index c2e15e2..01acac0 100644
--- a/templates/default/month_large.tpl
+++ b/templates/default/month_large.tpl
@@ -7,10 +7,10 @@
 		<!-- loop weekday off -->
 	</tr>
 	<!-- loop monthweeks on -->
-	<tr height="105">
+	<tr>
 		<!-- loop monthdays on -->
 		<!-- switch notthismonth on -->
-		<td valign="top" align="left" class="monthoff" width="105" height="105">
+		<td class="monthoff">
 			<div align="right">
 				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}"><font class="G10G">{DAY}</font></a>
 			</div>
@@ -19,7 +19,7 @@
 		</td>
 		<!-- switch notthismonth off -->
 		<!-- switch istoday on -->
-		<td valign="top" align="left" class="monthon" width="105" height="105">
+		<td class="monthon">
 			<div align="right">
 				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
 			</div>
@@ -28,7 +28,7 @@
 		</td>
 		<!-- switch istoday off -->
 		<!-- switch ismonth on -->
-		<td valign="top" align="left" class="monthreg" width="105" height="105">
+		<td class="monthreg">
 			<div align="right">
 				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
 			</div>