(OC)

phased out BBCode() and added the extras to bbcode_format()
condensed the style sheets.


git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@406 c5b2fb0a-d05d-0410-98c8-828840a80ff6

2 files changed, 5 insertions, 32 deletions

diff --git a/modules/news/functions.php b/modules/news/functions.php
index bd901aa..22952af 100644
--- a/modules/news/functions.php
+++ b/modules/news/functions.php
@@ -93,7 +93,7 @@ function displayComments($data){
 				
 				<div class="single_comment">
 					<img src="modules/news/images/comment_arrow.png" class="comment_arrow" />
-					<p> <?php echo BBCode($comment['message']); ?></p>
+					<p> <?php echo bbcode_format($comment['message']); ?></p>
 				
 				</div>
 				
@@ -145,17 +145,6 @@ function getNews($id = NULL){
  		
 	$result = $db->Query($query);
 	$data = $db->Fetch($result);
-	//decho($data);
-	// {{{ XXX: FIXME -- Re-write
-	/*
-	while(($row = $db->Fetch($result)) != false)
-	{
-	  $data[] = $row;
-	} 
-	
-	$db->Free($result);
-	*/
-	// }}}
 	
 	return $data;
 }
@@ -173,7 +162,7 @@ function displayNews($data){
 	foreach($data as $news)
 	{	
 		$numComments = getNumOfComments($news['news_id']);
-		//echo "<pre>".print_r($news,true)."</pre>";
+
 		OpenContent(); ?>
 	
 			<div class="contentHeading">
@@ -186,7 +175,7 @@ function displayNews($data){
 			</div>
 			<div class="content">
 				<img src="modules/news/categories/<?php echo $news['catimage']; ?>" alt="<?php echo $news['catname']; ?>" align="right" />
-				<?php echo BBCode($news['message']); ?>
+				<?php echo bbcode_format($news['message']); ?>
 			</div>	
 			<div class="contentFooter">
 				<table width="100%">
@@ -223,17 +212,6 @@ function commentForm(){
 	$cur_user_id = 0; //testing variable, until i get the login system working for this
 	
 	$logged_in = false;
-	// {{{ XXX: FIXME -- Re-write this
-	/*
-	$result = $db->Query("SELECT `username`, `avatar` FROM `mybb_users` WHERE `uid` = '$cur_user_id' LIMIT 1");
-	while(($row = $db->Fetch($result)) != false)
-	{
-		$username = $row['username'];
-		$avatar = $row['avatar'];
-		$logged_in = true;
-	}
-	*/
-	// }}}
 ?>
 <a name="add"></a>
 <h2>Add Your Comment</h2>
diff --git a/modules/newsreel/index.php b/modules/newsreel/index.php
index 70b9958..f45f2f5 100644
--- a/modules/newsreel/index.php
+++ b/modules/newsreel/index.php
@@ -1,4 +1,5 @@
 <!-- START News Reel -->
+<link rel="stylesheet" type="text/css" href="modules/newsreel/style.css" media="screen"/>
 <?php OpenContent(); ?>
 <script type="text/javascript">
 
@@ -96,13 +97,7 @@ window.onload = init_Slides;	//starts the reels movement
 	<table border="0" cellspacing="0" cellpadding="0" style="height:21px;" width="100%">
 	<tr>
 <?php
-$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>';
-		$y++;
-	}  */
+$y=0; 
 		$result = $db->Query("SELECT * FROM `bayonet_newsreel` WHERE `visible`= 1 ORDER BY `weight` ASC LIMIT 0, 6");
 		$row = $db->Fetch($result);