Moving files to valid XHTML.

20 files changed, 99 insertions, 97 deletions

diff --git a/README b/README
index aada6d8..5f71129 100644
--- a/README
+++ b/README
@@ -135,7 +135,7 @@ Changes:
 
 0.9.3	
 	-Multiple calendar support (up to 8).
-	-Fixed pesky <BR> tags in event popup.
+	-Fixed pesky <br /> tags in event popup.
 	-Added Esperanto language.
 	-Major bug fixes.
 	-Last to support Netscape 4.x
diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index b96fc46..519b6f8 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -934,8 +934,8 @@ foreach ($cal_filelist as $filename) {
 						break;
 						
 					case 'SUMMARY':
-						$data = str_replace("\\n", "<br>", $data);
-						$data = str_replace("\\r", "<br>", $data);
+						$data = str_replace("\\n", "<br />", $data);
+						$data = str_replace("\\r", "<br />", $data);
 						$data = htmlentities(urlencode($data));
 						if ($valarm_set == FALSE) { 
 							$summary = $data;
@@ -945,8 +945,8 @@ foreach ($cal_filelist as $filename) {
 						break;
 						
 					case 'DESCRIPTION':
-						$data = str_replace("\\n", "<br>", $data);
-						$data = str_replace("\\r", "<br>", $data);
+						$data = str_replace("\\n", "<br />", $data);
+						$data = str_replace("\\r", "<br />", $data);
 						$data = htmlentities(urlencode($data));
 						if ($valarm_set == FALSE) { 
 							$description = $data;
@@ -1041,8 +1041,8 @@ foreach ($cal_filelist as $filename) {
 						$organizer[] = array ('name' => $field, 'email' => $data);
 						break;
 					case 'LOCATION':
-						$data = str_replace("\\n", "<br>", $data);
-						$data = str_replace("\\r", "<br>", $data);
+						$data = str_replace("\\n", "<br />", $data);
+						$data = str_replace("\\r", "<br />", $data);
 						$location = $data;
 						break;
 					case 'URL':
diff --git a/functions/list_functions.php b/functions/list_functions.php
index 170daa5..b2dcf04 100644
--- a/functions/list_functions.php
+++ b/functions/list_functions.php
@@ -14,7 +14,7 @@ function list_jumps() {
 function list_calcolors() {
 	global $template, $master_array;
 	foreach ($master_array[-3] as $key => $val) {
-		$return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br>';
+		$return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br />';
 	}
 	
 	return $return;
diff --git a/functions/template.php b/functions/template.php
index f0e2352..e5c631b 100644
--- a/functions/template.php
+++ b/functions/template.php
@@ -246,7 +246,7 @@ class Page {
 								if ($event_calno < 1) $event_calno = 1;
 								if ($event_calno > 7) $event_calno = 7;
 								if ($event_status != '') {
-						  			$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">&nbsp;';
+						  			$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
 						  		}
 								$weekdisplay .= '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
 
@@ -261,9 +261,10 @@ class Page {
 								$event 		 = openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$thisday][$i]["key"])], $week_events_lines, 25, '', '', 'ps', $event_url);
 								$event_temp   = str_replace('{EVENT}', $event, $event_temp);
 								$event_temp   = str_replace('{EVENT_START}', $event_start, $event_temp);
-\								$event_temp   = str_replace('{CONFIRMED}', $confirmed, $event_temp);
+								$event_temp   = str_replace('{CONFIRMED}', $confirmed, $event_temp);
 								$event_temp   = str_replace('{EVENT_CALNO}', $event_calno, $event_temp);
 								$weekdisplay .= $event_temp;
+								$weekdisplay .= '</td>';
 								// End event drawing
 						  
 								break;
@@ -462,9 +463,9 @@ class Page {
 						  if ($event_calno < 1) $event_calno = 1;
 						  if ($event_calno > 7) $event_calno = 7;
 						  if ($event_status != '') {
-						  	$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">&nbsp;';
+						  	$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
 						  } elseif (is_array($event_recur)) {
-						  	$confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">&nbsp;';
+						  	$confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
 						  }
 						  $colspan_width = round((460 / $nbrGridCols) * $drawWidth);
 						  $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" width="'.$colspan_width.'" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
@@ -480,6 +481,7 @@ class Page {
 						  $event_temp   = str_replace('{CONFIRMED}', $confirmed, $event_temp);
 						  $event_temp   = str_replace('{EVENT_CALNO}', $event_calno, $event_temp);
 						  $daydisplay .= $event_temp;
+						  $daydisplay .= '</td>';
 						  // End event drawing
 						  
 						  break;
@@ -594,7 +596,7 @@ class Page {
 							'vtodo_text' 	=> $vtodo_text);
 
 						$vtodo_array 	= base64_encode(serialize($vtodo_array));
-						$vtodo_text 	= word_wrap(strip_tags(str_replace('<br>',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines);
+						$vtodo_text 	= word_wrap(strip_tags(str_replace('<br />',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines);
 						$data 			= array ('{VTODO_TEXT}', '{VTODO_ARRAY}');
 						$rep			= array ($vtodo_text, $vtodo_array);
 						
@@ -707,11 +709,11 @@ class Page {
 							$event_url 		= $val['url'];
 							if (!isset($val['event_start'])) {
 								if ($type == 'large') {
-									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">';
+									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0" />';
 									$switch['ALLDAY'] .= openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url);
 									$switch['ALLDAY'] .= '</div>';
 								} else {
-									$switch['ALLDAY'] .= '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0">';
+									$switch['ALLDAY'] .= '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0" />';
 								}
 							} else {	
 								$event_start = $val['start_unixtime'];
@@ -720,11 +722,11 @@ class Page {
 								$start2		 = date($timeFormat_small, $val['start_unixtime']);
 								$event_end   = date($timeFormat, @strtotime ($event_end));
 								if ($type == 'large') {
-									$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">';
-									$switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'<br>';
+									$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0" />';
+									$switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'<br />';
 									$switch['EVENT'] .= '</div>';
 								} else {
-									$switch['EVENT'] = '<img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0">';
+									$switch['EVENT'] = '<img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0" />';
 								}
 							}
 						}
diff --git a/includes/login.php b/includes/login.php
index c331aa3..38bbd5b 100644
--- a/includes/login.php
+++ b/includes/login.php
@@ -49,7 +49,7 @@ echo <<<END
 		</tr>
 	</table>
 	</form>
-	<img src="images/spacer.gif" width="1" height="10" alt=" "><br>
+	<img src="images/spacer.gif" width="1" height="10" alt=" "><br />
 
 END;
 
diff --git a/rss/index.php b/rss/index.php
index 4724909..99674be 100644
--- a/rss/index.php
+++ b/rss/index.php
@@ -17,10 +17,10 @@ foreach ($filelist as $file) {
 	$cal_filename_tmp = substr($file,0,-4);
 	$cal_tmp = urlencode($cal_filename_tmp);
 	$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
-	$rss_list = '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br>';
-	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br>';
-	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br>';
-	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br>';
+	$rss_list = '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />';
+	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br />';
+	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br />';
+	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br />';
 	$footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view;
 }
 
diff --git a/search.php b/search.php
index 69dbf58..4512f04 100644
--- a/search.php
+++ b/search.php
@@ -231,7 +231,7 @@ function format_recur($arr) {
 			if ($key == $last)	$list .= $monthsofyear_lang[($month-1)];
 			else 				$list .= $monthsofyear_lang[($month-1)].$d;
 		}
-		$print .= '<br>'."\n";
+		$print .= '<br />'."\n";
 		$print .= str_replace('%list%', $list, $format_recur_lang['bymonth']);
 	}
 	
@@ -246,7 +246,7 @@ function format_recur($arr) {
 			if ($key == $last)	$list .= $day;
 			else				$list .= $day.$d;
 		}
-		$print .= '<br>'."\n";
+		$print .= '<br />'."\n";
 		$print .= str_replace('%list%', $list, $format_recur_lang['bymonthday']);
 	}
 	
@@ -262,7 +262,7 @@ function format_recur($arr) {
 			if ($key == $last)	$list .= $daysofweek_lang[$num];
 			else				$list .= $daysofweek_lang[$num].$d;
 		}
-		$print .= '<br>'."\n";
+		$print .= '<br />'."\n";
 		$print .= str_replace('%list%', $list, $format_recur_lang['byday']);
 	}
 	
diff --git a/templates/default/admin.tpl b/templates/default/admin.tpl
index acf3169..06106e0 100644
--- a/templates/default/admin.tpl
+++ b/templates/default/admin.tpl
@@ -69,7 +69,7 @@
 						<!-- switch logged_in on -->
 						
 						<!-- switch action_message on -->
-						<font color="green">{L_CAL_FILE} {FILENUMBER}: {ACTION_MSG}</font><br>
+						<font color="green">{L_CAL_FILE} {FILENUMBER}: {ACTION_MSG}</font><br />
 						<!-- switch action_message off -->
 						<b>{L_ADDUPDATE_CAL}</b>
 						<p>{L_ADDUPDATE_DESC}</p>
diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl
index 8de9641..85b9bfa 100644
--- a/templates/default/calendar_nav.tpl
+++ b/templates/default/calendar_nav.tpl
@@ -22,11 +22,11 @@
 								<td>
 									<div style="padding: 5px;">
 										<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>
-											<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br>
-											<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br>
+											<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 />
+											<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
+											<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
 										</form>
 										<!-- switch show_search on -->
 										{SEARCH_BOX}
@@ -61,14 +61,14 @@
 							<tr>
 								<td>
 									<div style="padding-left: 5px;">
-										<b>{L_LEGEND}:</b><br>
+										<b>{L_LEGEND}:</b><br />
 										{LEGEND}
-										<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br>
+										<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
 										<!-- switch allow_preferences on -->
-										<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br>
+										<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
 										<!-- switch allow_preferences off -->
 										<!-- switch display_download on -->
-										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br>
+										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
 										<!-- switch display_download off -->
 										<!-- switch is_logged_in on -->
 										<a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a>
diff --git a/templates/default/error.tpl b/templates/default/error.tpl
index 7cd193a..b4eaa9c 100644
--- a/templates/default/error.tpl
+++ b/templates/default/error.tpl
@@ -20,16 +20,16 @@
 						<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">	
 							<tr>
 								<td align="center" valign="top">
-									<br>
+									<br />
 									{ERROR_MSG}
-									<br>
-									<br>
+									<br />
+									<br />
 									{ERROR_CALENDAR}
-									<br>
-									<br>
+									<br />
+									<br />
 									{L_ERROR_BACK}
-									<br>
-									<br>
+									<br />
+									<br />
 								</td>
 							</tr>
 						</table>
diff --git a/templates/default/event.tpl b/templates/default/event.tpl
index 7b16003..5f6431f 100644
--- a/templates/default/event.tpl
+++ b/templates/default/event.tpl
@@ -21,16 +21,16 @@
 					<!-- switch description off -->
 					<p>
 					<!-- switch organizer on -->
-					<b>{L_ORGANIZER}</b>: {ORGANIZER}<br>
+					<b>{L_ORGANIZER}</b>: {ORGANIZER}<br />
 					<!-- switch organizer off -->
 					<!-- switch attendee on -->
-					<b>{L_ATTENDEE}</b>: {ATTENDEE}<br>
+					<b>{L_ATTENDEE}</b>: {ATTENDEE}<br />
 					<!-- switch attendee off -->
 					<!-- switch status on -->
-					<b>{L_STATUS}</b>: {STATUS}<br>
+					<b>{L_STATUS}</b>: {STATUS}<br />
 					<!-- switch status off -->
 					<!-- switch location on -->
-					<b>{L_LOCATION}</b>: {LOCATION}<br>
+					<b>{L_LOCATION}</b>: {LOCATION}<br />
 					<!-- switch location off -->
 					</p>
 				</div>
diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index 87e6e28..da62efc 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.sourceforge.net/nuke/">PHP iCalendar 2.0</a><br>
+<center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.sourceforge.net/nuke/">PHP iCalendar 2.0</a><br />
 <!-- switch rss_valid on -->
 <p>
 <a style="color:gray" href="http://feeds.archive.org/validator/check?url={FOOTER_CHECK}">
@@ -6,7 +6,7 @@
 </p>
 <!-- switch rss_valid off -->
 <!-- switch rss_powered on -->
-{L_THIS_SITE_IS} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&amp;getdate={GETDATE}">RSS-Enabled</a><br>
+{L_THIS_SITE_IS} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&amp;getdate={GETDATE}">RSS-Enabled</a><br />
 <!-- switch rss_powered off -->
 Page generated in {GENERATED} seconds.
 </center>
diff --git a/templates/default/header.tpl b/templates/default/header.tpl
index fefa494..891760f 100644
--- a/templates/default/header.tpl
+++ b/templates/default/header.tpl
@@ -1,10 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
+	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
 	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
-  	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css">
+  	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
 	<!-- switch rss_available on -->
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_VIEW}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
 	<!-- switch rss_available off -->		
@@ -13,14 +13,14 @@
 </head>
 <body>
 <form name="eventPopupForm" id="eventPopupForm" method="post" action="includes/event.php" style="display: none;">
-  <input type="hidden" name="event" id="event" value="">
-  <input type="hidden" name="cal" id="cal" value="">
-  <input type="hidden" name="start" id="start" value="">
-  <input type="hidden" name="end" id="end" value="">
-  <input type="hidden" name="description" id="description" value="">
-  <input type="hidden" name="status" id="status" value="">
-  <input type="hidden" name="location" id="location" value="">
-  <input type="hidden" name="organizer" id="organizer" value="">
-  <input type="hidden" name="attendee" id="attendee" value="">
-  <input type="hidden" name="url" id="url" value="">
+  <input type="hidden" name="event" id="event" value="" />
+  <input type="hidden" name="cal" id="cal" value="" />
+  <input type="hidden" name="start" id="start" value="" />
+  <input type="hidden" name="end" id="end" value="" />
+  <input type="hidden" name="description" id="description" value="" />
+  <input type="hidden" name="status" id="status" value="" />
+  <input type="hidden" name="location" id="location" value="" />
+  <input type="hidden" name="organizer" id="organizer" value="" />
+  <input type="hidden" name="attendee" id="attendee" value="" />
+  <input type="hidden" name="url" id="url" value="" />
 </form>
\ No newline at end of file
diff --git a/templates/default/month.tpl b/templates/default/month.tpl
index 6fd628a..5d457d6 100644
--- a/templates/default/month.tpl
+++ b/templates/default/month.tpl
@@ -31,10 +31,10 @@
 			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
 		</tr>
 	</table>
-	<br>
+	<br />
 	{CALENDAR_NAV}
 	<!-- switch showbottom on -->
-	<br>
+	<br />
 	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
 		<tr>
 			<td align="center" valign="middle" bgcolor="white">
@@ -53,22 +53,22 @@
 					<!-- loop showbottomevents_odd on -->
 					<tr align="left" valign="top">
 						<td width="170" nowrap>
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br>
+							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
 							<span class="V9G">{START_TIME}</span>
 						</td>
 						<td>
-							{EVENT_TEXT}<br><span class="V9G">{CALNAME}</span>
+							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
 						</td>
 					</tr>
 					<!-- loop showbottomevents_odd off -->
 					<!-- loop showbottomevents_even on -->
 					<tr align="left" valign="top">
 						<td width="170" nowrap bgcolor="#EEEEEE">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br>
+							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
 							<span class="V9G">{START_TIME}</span>
 						</td>
 						<td bgcolor="#EEEEEE">
-							{EVENT_TEXT}<br><span class="V9G">{CALNAME}</span>
+							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
 						</td>
 					</tr>
 					<!-- loop showbottomevents_even off -->
diff --git a/templates/default/month_small.tpl b/templates/default/month_small.tpl
index 27606f7..d1cb890 100644
--- a/templates/default/month_small.tpl
+++ b/templates/default/month_small.tpl
@@ -32,7 +32,7 @@
 				</tr>
 				<!-- loop monthweeks off -->
 			</table>
-			<img src="images/spacer.gif" width="1" height="3" alt=" "><br>
+			<img src="images/spacer.gif" width="1" height="3" alt=" "><br />
 		</td>
 	</tr>
 </table>
\ No newline at end of file
diff --git a/templates/default/rss_index.tpl b/templates/default/rss_index.tpl
index 25df995..23bceb6 100644
--- a/templates/default/rss_index.tpl
+++ b/templates/default/rss_index.tpl
@@ -35,7 +35,7 @@
 								<td width="2%"></td>
 								<td width="98%" valign="top" align="left">
 									<br />
-									{L_THIS_SITE_IS} <a class="psf" href="http://www.oreillynet.com/rss/">RSS 0.91 enabled</a>.<br>
+									{L_THIS_SITE_IS} <a class="psf" href="http://www.oreillynet.com/rss/">RSS 0.91 enabled</a>.<br />
 									<br />
 									{RSS_LIST}
 									<br />
diff --git a/templates/default/search.tpl b/templates/default/search.tpl
index 40f39ce..b6204fe 100644
--- a/templates/default/search.tpl
+++ b/templates/default/search.tpl
@@ -30,7 +30,7 @@
 			<div style="padding: 10px;">
 				<div><p class="V12">{L_QUERY}: {FORMATTED_SEARCH}</p></div>
 				<!-- switch results on -->
-				<font class="V12"><b><a class="ps3" href="day.php?cal={CAL}&amp;getdate={KEY}">{DAYOFMONTH}</a></b></font><br>
+				<font class="V12"><b><a class="ps3" href="day.php?cal={CAL}&amp;getdate={KEY}">{DAYOFMONTH}</a></b></font><br />
 				<div style="margin-left: 10px; margin-bottom: 10px;">
 					<table width="100%" border="0" cellspacing="1" cellpadding="1">
 						<tr>
@@ -56,7 +56,7 @@
 					</table>
 				</div>
 				<!-- switch exceptions on -->		
-				<font class="V10"><i>{L_EXCEPTION}</i>: <a class="ps3" href="day.php?cal={CAL}&amp;getdate={KEY}">{DAYOFMONTH}</a></font><br>
+				<font class="V10"><i>{L_EXCEPTION}</i>: <a class="ps3" href="day.php?cal={CAL}&amp;getdate={KEY}">{DAYOFMONTH}</a></font><br />
 				<div style="margin-left: 10px;">
 					<table width="100%" border="0" cellspacing="1" cellpadding="1">
 						<tr>
@@ -82,7 +82,7 @@
 					</table>
 				</div>
 				<!-- switch exceptions off -->		
-				<br>
+				<br />
 				<!-- switch results off -->
 				
 				<!-- switch no_results on -->
@@ -94,7 +94,7 @@
 				<div align="center">
 					{SEARCH_BOX}
 				</div>
-				<br>
+				<br />
 			</div>
 		</td>
 	</tr>
diff --git a/templates/default/sidebar.tpl b/templates/default/sidebar.tpl
index 7df2dff..961a7e0 100644
--- a/templates/default/sidebar.tpl
+++ b/templates/default/sidebar.tpl
@@ -35,21 +35,21 @@
 <!-- switch show_user_login off -->
 <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
 	<tr>
-		<td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left"></a></td>
+		<td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left" /></a></td>
 		<td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td>
-		<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right"></a></td>
+		<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right" /></a></td>
 	</tr>
 	<tr>
 		<td colspan="3" bgcolor="#FFFFFF" align="left">
 			<div style="padding: 5px;">
-				<b>{L_LEGEND}:</b><br>
+				<b>{L_LEGEND}:</b><br />
 				{LEGEND}
-				<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br>
+				<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
 				<!-- switch allow_preferences on -->
-				<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br>
+				<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
 				<!-- switch allow_preferences off -->
 				<!-- switch display_download on -->
-				<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br>
+				<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
 				<!-- switch display_download off -->
 				<!-- switch is_logged_in on -->
 				<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
@@ -75,11 +75,11 @@
 		<td bgcolor="#FFFFFF" align="left">
 			<div style="padding: 5px;">
 				<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>
-					<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br>
-					<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br>
+					<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 />
+					<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
+					<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
 				</form>
 				<!-- switch show_search on -->
 				{SEARCH_BOX}
@@ -146,21 +146,21 @@
 				<table cellpadding="0" cellspacing="0" border="0">
 					<!-- switch show_completed on -->
 					<tr>
-						<td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle"></td>
+						<td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
 						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
 						<td><s><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></s></td>
 					</tr>
 					<!-- switch show_completed off -->
 					<!-- switch show_important on -->
 					<tr>
-						<td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle"></td>
+						<td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
 						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
 						<td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td>
 					</tr>
 					<!-- switch show_important off -->
 					<!-- switch show_normal on -->
 					<tr>
-						<td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle"></td>
+						<td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
 						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
 						<td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td>
 					</tr>
@@ -190,7 +190,7 @@
 		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
 	</tr>
 </table>
-<img src="images/spacer.gif" width="1" height="10" alt=" "><br />
+<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
 
 {MONTH_SMALL|+0}
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -200,7 +200,7 @@
 		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
 	</tr>
 </table>
-<img src="images/spacer.gif" width="1" height="10" alt=" "><br />
+<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
 
 {MONTH_SMALL|+1}
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/templates/default/todo.tpl b/templates/default/todo.tpl
index 5527a1e..297fcdb 100644
--- a/templates/default/todo.tpl
+++ b/templates/default/todo.tpl
@@ -21,16 +21,16 @@
 					<!-- switch description off -->
 					<p>
 					<!-- switch status on -->
-					<b>{L_STATUS}</b>: {STATUS}<br>
+					<b>{L_STATUS}</b>: {STATUS}<br />
 					<!-- switch status off -->
 					<!-- switch priority on -->
-					<b>{L_PRIORITY}</b>: {PRIORITY}<br>
+					<b>{L_PRIORITY}</b>: {PRIORITY}<br />
 					<!-- switch priority off -->
 					<!-- switch start_date on -->
-					<b>{L_CREATED}</b>: {START_DATE}<br>
+					<b>{L_CREATED}</b>: {START_DATE}<br />
 					<!-- switch start_date off -->
 					<!-- switch due_date on -->
-					<b>{L_DUE}</b>: {DUE_DATE}<br>
+					<b>{L_DUE}</b>: {DUE_DATE}<br />
 					<!-- switch due_date off -->
 					</p>
 				</div>
diff --git a/templates/default/year.tpl b/templates/default/year.tpl
index 7b564f0..2534826 100644
--- a/templates/default/year.tpl
+++ b/templates/default/year.tpl
@@ -38,7 +38,7 @@
 			</td>
 		</tr>
 	</table>
-	<br>
+	<br />
 	<table border="0" width="670" cellspacing="0" cellpadding="0">
 		<tr>
 			<td width="210" valign="top" align="left">