5 files changed, 18 insertions, 18 deletions
diff --git a/modules/download/index.php b/modules/download/index.php
index 1fa99e5..300bd46 100644
--- a/modules/download/index.php
+++ b/modules/download/index.php
@@ -26,13 +26,13 @@ $download = NULL;
 $download_relative_path = "modules/" . basename(dirname(__FILE__)) . "/files/";
 $download_absolute_path = dirname(__FILE__) . "/files/"; 
 
-$result = $db->Query("SELECT uid, name, description, filename FROM bayonet_downloads");
+$result = $db->Query("SELECT `file_id`, `name`, `description`, `filename` FROM `bayonet_downloads`");
 while(($row = $db->Fetch($result)) !== false)
 {
 	$download[] = $row;
 }
 
-OpenTable();
+OpenContent();
 echo "<div class=\"contentHeading\">Downloads</div>";
 echo "<div class=\"content\">";
 foreach($download as $file)
@@ -59,7 +59,7 @@ decho($download);
 
 echo "</div>";
 
-CloseTable();
+CloseContent();
 
 
 ?>
 \ No newline at end of file
diff --git a/modules/index/index.php b/modules/index/index.php
index b7554b7..7d23bc6 100644
--- a/modules/index/index.php
+++ b/modules/index/index.php
@@ -26,9 +26,9 @@
 		  }
 		  else
 		  {
-		    OpenTable();
+		    OpenContent();
 		    ReportError("Cannot load module '{$module}' directory.<br>\n");
-		    CloseTable();    
+		    CloseContent();    
 		  }
 		  echo "<br />";
 	}
diff --git a/modules/news/functions.php b/modules/news/functions.php
index ee4345d..b76a53e 100644
--- a/modules/news/functions.php
+++ b/modules/news/functions.php
@@ -49,7 +49,7 @@ function getNewsComments($id){
 function displayComments($data){
 	
 	date_default_timezone_set("America/New_York");
-	OpenTable();
+	OpenContent();
 	?>
 	
 	<div id="comments">
@@ -104,7 +104,7 @@ function displayComments($data){
 	
 	commentForm();
 	
-	CloseTable();
+	CloseContent();
 }
 
  /**
@@ -164,7 +164,7 @@ function displayNews($data){
 	{
 		$numComments = getNumOfComments($news['news_id']);
 		
-		OpenTable(); ?>
+		OpenContent(); ?>
 	
 			<div class="contentHeading">
 					<table width="100%">
@@ -190,7 +190,7 @@ function displayNews($data){
 			</div>
 	
 	<?php	
-		CloseTable();
+		CloseContent();
 		echo "<br />";
 	}
 }
@@ -245,7 +245,7 @@ function commentForm(){
 				?>
 				<br><span><?php echo date('F jS', time()); ?></span></p>
 			</div>
-			<form action="<?php $_SERVER['PHP_SELF']?>" method="POST" id="comment_form">
+			<form action="<?php $_SERVER['PHP_SELF']; ?>" method="POST" id="comment_form">
 				<!-- <fieldset> -->
 					<textarea name="comment" id="comment" rows="8" cols="10" tabindex="1" class="input textarea required"></textarea> 
 					<input type="hidden" value="<?php echo $cur_user_id; ?>" name="author" />
diff --git a/modules/newsreel/index.php b/modules/newsreel/index.php
index f0b9d73..0a986c2 100644
--- a/modules/newsreel/index.php
+++ b/modules/newsreel/index.php
@@ -1,5 +1,5 @@
 <!-- START News Reel -->
-<?php OpenTable(); ?>
+<?php OpenContent(); ?>
 <script type="text/javascript">
 
 var current = "0";
@@ -102,12 +102,12 @@ $y=0;
 	$get_slidenav = mysql_query("SELECT * FROM `bayonet_newsreel` WHERE `visible`= 1 ORDER BY `weight` ASC LIMIT 0, 6");
 	while($echo_slidenav = mysql_fetch_array($get_slidenav)){
 
-		echo '<td id="'.$y.'" width="'.$width.'%" class="slidenav" onClick="nextSlide(this.id,true)" onmouseover="mouseOverBG(this.id)" onmouseout="mouseOutBG(this.id)">'.$echo_slidenav['title'].'</td>';
+		echo '<td id="'.$y.'" width="'.$width.'%" class="slidenav" onclick="nextSlide(this.id,true)" onmouseover="mouseOverBG(this.id)" onmouseout="mouseOutBG(this.id)">'.$echo_slidenav['title'].'</td>';
 		$y++;
 	}
 ?>
 	</tr>
 	</table>
 </div></div>
-<?php CloseTable(); ?>
+<?php CloseContent(); ?>
 <!-- END News Reel -->
 \ No newline at end of file
diff --git a/modules/page/index.php b/modules/page/index.php
index 68dbb62..abf559f 100644
--- a/modules/page/index.php
+++ b/modules/page/index.php
@@ -42,7 +42,7 @@ if(isset($_GET['list']))
 		}
 		mysql_free_result($result);
 		
-		OpenTable();
+		OpenContent();
 		echo "<div class=\"contentHeading\">Page Map</div>";
 		echo "<div class=\"content\">";
 		echo "<ul>";
@@ -52,7 +52,7 @@ if(isset($_GET['list']))
 		}
 		echo "</ul>";
 		echo "</div>";
-		CloseTable();
+		CloseContent();
 		
 		/* Kill module execution to prevent odd page results */
 		return;
@@ -76,7 +76,7 @@ if($proceed > 0)
   while(($row = $db->Fetch($result))!==false)
   {
     $page = $row;
-    OpenTable();
+    OpenContent();
     echo "<div class=\"content\">";
    	$aresult = $db->Query("SELECT * FROM `bayonet_articles` WHERE `page_id` = $id ORDER BY `weight` ASC");
     while(($article = $db->Fetch($aresult))!==false)
@@ -84,10 +84,10 @@ if($proceed > 0)
 		$articleTitle = $article['title'];
 		echo '<h2>'.$articleTitle.'</h2>';
 		//echo "<h3>".$article['title']."</h3>";
-		echo BBCode($article['text']);	 
+		echo bbcode_format($article['text']);	 
 	} 
 	echo "</div>";
-	CloseTable();
+	CloseContent();
 	  
   }
   ?>