From ad4b3af658ce9906a192164bdb4e00ad4f8acb39 Mon Sep 17 00:00:00 2001
From: fenner <fenner>
Date: Wed, 27 Nov 2002 21:13:19 +0000
Subject: Some HTML validator cleanups: - Use &amp; instead of & in URLs - Use
 valign="middle" instead of valign="center" - Add type="text/javascript" to
 <script>

---
 day.php                   |  2 +-
 functions/error.php       |  2 +-
 functions/event.js        |  4 ++--
 functions/todo.js         |  2 +-
 includes/calendar_nav.php | 10 +++++-----
 includes/footer.inc.php   | 15 ++++++++++++++-
 includes/sidebar.php      | 16 ++++++++--------
 month.php                 |  2 +-
 print.php                 | 12 ++++++------
 week.php                  |  2 +-
 10 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/day.php b/day.php
index ec7839d..e628a35 100644
--- a/day.php
+++ b/day.php
@@ -55,7 +55,7 @@ if (is_array($master_array[($getdate)])) {
 		// if RSS is enabled, set the RSS auto-discovery link
 		if ($enable_rss == 'yes') 
 		{
-    		echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&rssview=day\">";
+    		echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&amp;rssview=day\">";
 		} 
 	?>
 	<?php include (BASE.'functions/event.js'); ?>
diff --git a/functions/error.php b/functions/error.php
index 8b5b914..d0faefd 100644
--- a/functions/error.php
+++ b/functions/error.php
@@ -34,7 +34,7 @@ function error($error_msg='There was an error processing the request.', $file='N
 						<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">
 							<tr>
 								<td align="left" valign="top" width="1%" class="sideback"><img src="images/spacer.gif" width="1" height="20"></td>
-								<td align="center" valign="center" width="98%" class="sideback"><b><?php echo $error_window_lang; ?></b></td>
+								<td align="center" valign="middle" width="98%" class="sideback"><b><?php echo $error_window_lang; ?></b></td>
 								<td class="sideback" width="1%"></td>
 							</tr>
 						</table>
diff --git a/functions/event.js b/functions/event.js
index 59e762d..12f7b74 100644
--- a/functions/event.js
+++ b/functions/event.js
@@ -1,4 +1,4 @@
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
 <!--
 	function openEventInfo(event, calendarname, start, end, description)
 	{	
@@ -19,4 +19,4 @@
 	}
 
 //-->
-</script>
\ No newline at end of file
+</script>
diff --git a/functions/todo.js b/functions/todo.js
index 29a782a..e9f6c3b 100644
--- a/functions/todo.js
+++ b/functions/todo.js
@@ -1,5 +1,5 @@
 
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
 <!--
 	function openTodoInfo(vtodo, calendarname, start, due, description, status, priority)
 	{	
diff --git a/includes/calendar_nav.php b/includes/calendar_nav.php
index 2fccf2d..448f660 100644
--- a/includes/calendar_nav.php
+++ b/includes/calendar_nav.php
@@ -25,7 +25,7 @@
 		<td width="1%" valign="top" align="right">
 			<table cellpadding="0" cellspacing="0" border="0" width="160">
 				<tr>
-					<td valign="center" align="center">
+					<td valign="middle" align="center">
 						<table width="160" border="0" cellpadding="0" cellspacing="0">
 							<tr>
 								<td align="left" valign="top" width="1"><img src="images/spacer.gif" width="1" height="20"></td>
@@ -108,7 +108,7 @@
 					<td width="160" valign="top">
 						<table cellpadding="0" cellspacing="0" border="0" width="160">
 							<tr>
-								<td valign="center" align="center">
+								<td valign="middle" align="center">
 									<table width="160" border="0" cellpadding="0" cellspacing="0">
 										<tr>
 											<td colspan="3" bgcolor="#FFFFFF" align="left">
@@ -176,7 +176,7 @@
 					<td width="160" valign="top">
 						<table cellpadding="0" cellspacing="0" border="0" width="160">
 							<tr>
-								<td valign="center" align="left" valign="top">
+								<td valign="middle" align="left" valign="top">
 									<table width="160" border="0" cellpadding="0" cellspacing="0">
 										<tr>
 											<td colspan="3" bgcolor="#FFFFFF" align="left" valign="top">
@@ -196,7 +196,7 @@
 															<a class=\"psf\" href=\"week.php?cal=$cal&amp;getdate=$today_today\">$goweek_lang</a><br>\n
 															<a class=\"psf\" href=\"month.php?cal=$cal&amp;getdate=$today_today\">$gomonth_lang</a><br>\n
 															<a class=\"psf\" href=\"year.php?cal=$cal&amp;getdate=$today_today\">$goyear_lang</a><br>\n
-															<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&printview=$current_view\">$goprint_lang</a><br>\n
+															<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n
 															<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n
 															<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$filename\">$download_lang</a>\n
 														"; ?>
@@ -219,7 +219,7 @@
 		<td width="1%" valign="top" align="left">
 	<table cellpadding="0" cellspacing="0" border="0" width="160">
 		<tr>
-			<td valign="center" align="center">
+			<td valign="middle" align="center">
 				<table width="160" border="0" cellpadding="0" cellspacing="0">
 					<tr>
 						<td align="left" valign="top" width="1"><img src="images/spacer.gif" width="1" height="20"></td>
diff --git a/includes/footer.inc.php b/includes/footer.inc.php
index 2b550a3..c4bedac 100644
--- a/includes/footer.inc.php
+++ b/includes/footer.inc.php
@@ -1 +1,14 @@
-<?php 

echo "<center><font class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9 CVS</a>";
if ($enable_rss == 'yes') {
	echo "<br>\n";
	if ($current_view == 'rssindex') {
		echo '<a style="color:gray" href="http://feeds.archive.org/validator/check?url='.$footer_check.'"><img src="'.BASE.'images/valid-rss.png" alt="[Valid RSS]" title="Validate my RSS feed" width="88" height="31" border="1" vspace="3" />';
	} else {
		echo $this_site_is_lang.' <a class="psf" href="'.BASE.'rss/index.php?cal='.$cal.'&amp;getdate='.$getdate.'"">RSS-Enabled</a></font></center>';
	}
}
echo '</font></center>';

?>
\ No newline at end of file
+<?php 
+
+echo "<center><font class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9 CVS</a>";
+if ($enable_rss == 'yes') {
+	echo "<br>\n";
+	if ($current_view == 'rssindex') {
+		echo '<a style="color:gray" href="http://feeds.archive.org/validator/check?url='.$footer_check.'"><img src="'.BASE.'images/valid-rss.png" alt="[Valid RSS]" title="Validate my RSS feed" width="88" height="31" border="1" vspace="3" />';
+	} else {
+		echo $this_site_is_lang.' <a class="psf" href="'.BASE.'rss/index.php?cal='.$cal.'&amp;getdate='.$getdate.'">RSS-Enabled</a>';
+	}
+}
+echo '</font></center>';
+
+?>
diff --git a/includes/sidebar.php b/includes/sidebar.php
index 6619997..663ff8b 100644
--- a/includes/sidebar.php
+++ b/includes/sidebar.php
@@ -12,7 +12,7 @@
 	
 	<table cellpadding="0" cellspacing="0" border="0" width="170">
 		<tr>
-			<td valign="center" align="center">
+			<td valign="middle" align="center">
 				<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
 					<tr>
 						<td align="left" valign="top" width="24" class="sideback"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&amp;getdate=$yesterdays_date\"><img src=\"styles/$style_sheet/left_arrows.gif\" alt=\"right\" width=\"16\" height=\"20\" border=\"0\" align=\"left\"></a>"; ?></td>
@@ -37,7 +37,7 @@
 										<a class=\"psf\" href=\"week.php?cal=$cal&amp;getdate=$today_today\">$goweek_lang</a><br>\n
 										<a class=\"psf\" href=\"month.php?cal=$cal&amp;getdate=$today_today\">$gomonth_lang</a><br>\n
 										<a class=\"psf\" href=\"year.php?cal=$cal&amp;getdate=$today_today\">$goyear_lang</a><br>\n
-										<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&printview=$current_view\">$goprint_lang</a><br>\n
+										<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n
 										<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n
 										<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$filename\">$download_lang</a>\n
 									"; ?>
@@ -56,7 +56,7 @@
 	<br>
 	<table cellpadding="0" cellspacing="0" border="0" width="170">
 		<tr>
-			<td valign="center" align="center">
+			<td valign="middle" align="center">
 				<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
 					<tr>
 						<td align="left" valign="top" width="1%" class="sideback"><img src="images/spacer.gif" width="1" height="20"></td>
@@ -132,7 +132,7 @@
 <?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?>
 	<table cellpadding="0" cellspacing="0" border="0" width="170">
 		<tr>
-			<td valign="center" align="center">
+			<td valign="middle" align="center">
 				<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
 					<tr>
 						<td align="left" valign="top" width="1%" class="sideback"><img src="images/spacer.gif" width="1" height="20"></td>
@@ -195,7 +195,7 @@
 if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 	<table cellpadding="0" cellspacing="0" border="0" width="170">
 		<tr>
-			<td valign="center" align="center">
+			<td valign="middle" align="center">
 				<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
 					<tr>
 						<td align="left" valign="top" width="1%" class="sideback"><img src="images/spacer.gif" width="1" height="20"></td>
@@ -267,7 +267,7 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 ?>	
 	<table cellpadding="0" cellspacing="0" border="0" width="170">
 		<tr>
-			<td valign="center" align="center">
+			<td valign="middle" align="center">
 				<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
 					<tr>
 
@@ -348,7 +348,7 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 	<br>
 	<table cellpadding="0" cellspacing="0" border="0" width="170">
 		<tr>
-			<td valign="center" align="center">
+			<td valign="middle" align="center">
 				<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
 					<tr>
 						<td align="left" valign="top" width="1" class="sideback"><img src="images/spacer.gif" width="1" height="20"></td>
@@ -428,7 +428,7 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 	<br>
 	<table cellpadding="0" cellspacing="0" border="0" width="170">
 		<tr>
-			<td valign="center" align="center">
+			<td valign="middle" align="center">
 				<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
 					<tr>
 						<td align="left" valign="top" width="1" class="sideback"><img src="images/spacer.gif" width="1" height="20"></td>
diff --git a/month.php b/month.php
index 2d48693..ea4aecd 100644
--- a/month.php
+++ b/month.php
@@ -54,7 +54,7 @@ $num_of_events = 0;
 		// if RSS is enabled, set the RSS auto-discovery link
 		if ($enable_rss == 'yes') 
 		{
-    		echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&rssview=month\">";
+    		echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&amp;rssview=month\">";
 		} 
 	?>
 	<?php include (BASE.'functions/event.js'); ?>
diff --git a/print.php b/print.php
index 81b9b81..a557bee 100644
--- a/print.php
+++ b/print.php
@@ -58,18 +58,18 @@ if ($printview == 'day') {
       				<td class="navback">
       					<table width="100%" border="0" cellspacing="0" cellpadding="0">
       						<tr>
-								<td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$prev&printview=$printview\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"\" border=\"0\" align=\"right\"></a>"; ?></td>
+								<td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$prev&amp;printview=$printview\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"\" border=\"0\" align=\"right\"></a>"; ?></td>
 								<td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $print_title; ?></font></td>
-      							<td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$next&printview=$printview\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"\" border=\"0\" align=\"left\"></a>"; ?></td>
+      							<td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$next&amp;printview=$printview\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"\" border=\"0\" align=\"left\"></a>"; ?></td>
       						</tr>
       					</table>
       				</td>
       				<td align="right" width="90" class="navback">	
       					<table width="90" border="0" cellpadding="0" cellspacing="0">
 							<tr>
-								<td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&amp;getdate='.$getdate.'&printview=day"><img src="styles/'.$style_sheet.'/day_on.gif" alt="" border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&amp;getdate='.$getdate.'&printview=week"><img src="styles/'.$style_sheet.'/week_on.gif" alt="" border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&amp;getdate='.$getdate.'&printview=month"><img src="styles/'.$style_sheet.'/month_on.gif" alt="" border="0"></a></td>'; ?>
+								<td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&amp;getdate='.$getdate.'&amp;printview=day"><img src="styles/'.$style_sheet.'/day_on.gif" alt="" border="0"></a></td>'; ?>
+								<td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&amp;getdate='.$getdate.'&amp;printview=week"><img src="styles/'.$style_sheet.'/week_on.gif" alt="" border="0"></a></td>'; ?>
+								<td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&amp;getdate='.$getdate.'&amp;printview=month"><img src="styles/'.$style_sheet.'/month_on.gif" alt="" border="0"></a></td>'; ?>
 							</tr>
 						</table>
 					</td>
@@ -167,4 +167,4 @@ if ($printview == 'day') {
 <?php include (BASE.'includes/footer.inc.php'); ?>
 </center>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/week.php b/week.php
index dec4c81..d795696 100644
--- a/week.php
+++ b/week.php
@@ -55,7 +55,7 @@ for ($i=0;$i<7;$i++) {
 		// if RSS is enabled, set the RSS auto-discovery link
 		if ($enable_rss == 'yes') 
 		{
-    		echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&rssview=week\">";
+    		echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&amp;rssview=week\">";
 		} 
 	?>
 	<?php include (BASE.'functions/event.js'); ?>
-- 
cgit v1.2.3