pulled footer together

7 files changed, 48 insertions, 56 deletions

diff --git a/day.php b/day.php
index e7d80f7..4fdc00e 100644
--- a/day.php
+++ b/day.php
@@ -258,8 +258,10 @@ if (is_array($master_array[($getdate)])) {
 </table>
 </td>
 		<td width="20"><img src="images/spacer.gif" width="20" height="1" alt=""></td>
-		<td width="160" valign="top"><?php include('./sidebar.php'); ?><center>
-		<?php echo '<font class="V9"><br>'.$powered_by_lang.' <a class="psf" href="http://phpicalendar.sourceforge.net/">PHP iCalendar '.$version_lang.'</a></font>'; ?></center></td>
+		<td width="160" valign="top">
+			<?php include (BASE.'sidebar.php'); ?>
+			<?php include (BASE.'footer.inc.php'); ?>
+		</td>
 	</tr>
 </table>
 </center>
diff --git a/functions/error.php b/functions/error.php
index 8a59e86..8f36b5c 100644
--- a/functions/error.php
+++ b/functions/error.php
@@ -1,9 +1,10 @@
 <?php
+define('BASE','../');
 function error($error_msg='There was an error processing the request.', $file='NONE') {
 	global $style_sheet, $powered_by_lang, $version_lang, $error_title_lang, $error_window_lang, $error_calendar_lang, $error_back_lang;
 	if (!isset($style_sheet))			$style_sheet = 'silver';
 	if (!isset($powered_by_lang))		$powered_by_lang = 'Powered by';
-	if (!isset($version_lang))			$version_lang = '0.6';
+	if (!isset($version_lang))			$version_lang = '0.8';
 	if (!isset($error_title_lang))		$error_title_lang = 'Error!';
 	if (!isset($error_window_lang))		$error_window_lang = 'There was an error!';
 	if (!isset($error_calendar_lang))	$error_calendar_lang = 'The calendar "%s" was being processed when this error occurred.';
@@ -24,44 +25,43 @@ function error($error_msg='There was an error processing the request.', $file='N
 <table border="0" width="700" cellspacing="0" cellpadding="0">
 	<tr>
 		<td width="520" valign="top" align="center">
-<table width="520" border="0" cellspacing="0" cellpadding="0" class="calborder">
-    <tr>
-     	<td align="center" valign="middle">
-      		<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">
-      			<tr>
-      				<td size="30" class="navback"><img height="30" width="1" src="images/spacer.gif"></td>
-					<td align="center" valign="center" class="navback"><font class="H20"><?php echo $error_window_lang; ?></font></td>
-					<td size="30" class="navback"><img height="30" width="1" src="images/spacer.gif"></td>
-      			</tr>
-      		</table>
-      	</td>
-	</tr>
-	<tr>
-		<td>
-      		<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">	
+			<table width="520" border="0" cellspacing="0" cellpadding="0" class="calborder">
 				<tr>
-					<td align="center" valign="top">
-						<br>
-						<?php echo $error_msg; ?>
-						<br>
-						<br>
-						<?php echo $error_calendar; ?>
-						<br>
-						<br>
-						<?php echo $error_back_lang; ?>
-						<br>
-						<br>
+					<td align="center" valign="middle">
+						<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 class="sideback" width="1%"></td>
+							</tr>
+						</table>
 					</td>
 				</tr>
-        	</table>
-    	</td>
-	</tr>
-</table>
-		<?php echo "<font class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/\">PHP iCalendar $version_lang</a></font>"; ?></center></td>
-
-</td>
+				<tr>
+					<td>
+						<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">	
+							<tr>
+								<td align="center" valign="top">
+									<br>
+									<?php echo $error_msg; ?>
+									<br>
+									<br>
+									<?php echo $error_calendar; ?>
+									<br>
+									<br>
+									<?php echo $error_back_lang; ?>
+									<br>
+									<br>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</td>
 	</tr>
 </table>
+<?php include (BASE.'footer.inc.php'); ?>
 </center>
 </body>
 </html>
diff --git a/languages/english.inc.php b/languages/english.inc.php
index c5a4390..b600d0c 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // English language include
-// For version 0.7 PHP iCalendar
+// For version 0.8 PHP iCalendar
 //
 // Translation by Chad Little (chad@chadsdomain.com)
 //
@@ -25,7 +25,7 @@ $last_year_lang		= 'Previous Year';
 $subscribe_lang		= 'Subscribe';
 $download_lang		= 'Download';
 $powered_by_lang 	= 'Powered by';
-$version_lang		= '0.7';
+$version_lang		= '0.8';
 $event_lang			= 'Event';
 $event_start_lang	= 'Start Time';
 $event_end_lang		= 'End Time';
diff --git a/month.php b/month.php
index f60a238..967c9f3 100644
--- a/month.php
+++ b/month.php
@@ -191,10 +191,8 @@
 		</td>
 	</tr>
 </table>
-<?php include "./month_bottom.php"; ?>
-
-<br>
-<?php echo '<font class="V9"><br>'.$powered_by_lang.' <a class="psf" href="http://phpicalendar.sourceforge.net/">PHP iCalendar '.$version_lang.'</a></font>'; ?>
+<?php include (BASE.'month_bottom.php'); ?>
+<?php include (BASE.'footer.inc.php'); ?>
 </center>
 </body>
 </html>
diff --git a/search.php b/search.php
index 2a3f28c..a2ab225 100644
--- a/search.php
+++ b/search.php
@@ -184,9 +184,6 @@ if (isset($master_array) && is_array($master_array)) {
 </head>
 <body>
 <center>
-<table border="0" width="700" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="520" valign="top">
 <table border="0" width="520" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder">
 	<tr>
 		<td align="left" valign="top" width="1"  class="sideback"><?php echo "<img src=\"images/spacer.gif\" alt=\"right\" width=\"1\" height=\"20\" border=\"0\" align=\"left\">"; ?></td>
@@ -272,12 +269,7 @@ if (isset($master_array) && is_array($master_array)) {
 		</td>
 	</tr>
 </table>
-</td>
-		<td width="20"><img src="images/spacer.gif" width="20" height="1" alt=""></td>
-		<td width="160" valign="top"><?php include('./sidebar.php'); ?><center>
-		<?php echo '<font class="V9"><br>'.$powered_by_lang.' <a class="psf" href="http://phpicalendar.sourceforge.net/">PHP iCalendar '.$version_lang.'</a></font>'; ?></center></td>
-	</tr>
-</table>
+<?php include (BASE.'footer.inc.php'); ?>
 </center>
 </body>
 </html>
diff --git a/week.php b/week.php
index 8397dc1..4bd1684 100644
--- a/week.php
+++ b/week.php
@@ -317,8 +317,10 @@ for ($i=0;$i<7;$i++) {
 </table>
 </td>
 		<td width="20"><img src="images/spacer.gif" width="20" height="1" alt=""></td>
-		<td width="160" valign="top"><?php include('./sidebar.php'); ?><center>
-		<?php echo '<font class="V9"><br>'.$powered_by_lang.' <a class="psf" href="http://phpicalendar.sourceforge.net/">PHP iCalendar '.$version_lang.'</a></font>'; ?></center></td>
+		<td width="160" valign="top">
+			<?php include (BASE.'sidebar.php'); ?>
+			<?php include (BASE.'footer.inc.php'); ?>
+		</td>
 	</tr>
 </table>
 </center>
diff --git a/year.php b/year.php
index 69f7ef9..d634ac9 100644
--- a/year.php
+++ b/year.php
@@ -174,9 +174,7 @@ $thisday2 = localizeDate($dateFormat_week_list, $unix_time);
 			} while (($m < 3) && ($n < 12)); 
 		?>
 </table>
-<br>
-<?php echo '<font class="V9"><br>'.$powered_by_lang.' <a class="psf" href="http://phpicalendar.sourceforge.net/">PHP iCalendar '.$version_lang.'</a></font>'; ?></center></td>
-<br>
+<?php include (BASE.'footer.inc.php'); ?>
 </center>
 </body>
 </html>