Merge branch 'master' of ssh://3rd-infantry-division.org/~/git/bayonet

2 files changed, 43 insertions, 8 deletions

diff --git a/modules/news/functions.php b/modules/news/functions.php
index f3505df..67e9b43 100644
--- a/modules/news/functions.php
+++ b/modules/news/functions.php
@@ -130,10 +130,11 @@ function getNumOfComments($id){
 function getNews($id = NULL, $limit = NULL, $index = 0){
 
 	global $db;
-	$query = "SELECT n.news_id, n.title, n.message, n.date, n.category_id, u.username AS author, c.name AS catname, c.image AS catimage ".
+	$query = "SELECT n.news_id, n.title, n.message, n.date, n.edited, n.category_id, u.username AS author, e.username AS eauthor, c.name AS catname, c.image AS catimage ".
                      "FROM `bayonet_news` AS n ".
                      "INNER JOIN `bayonet_news_categories` AS c ON c.category_id = n.category_id ".
-                     "LEFT OUTER JOIN `mybb_users` AS u ON u.uid = n.author_id ";
+                     "LEFT OUTER JOIN `bayonet_users` AS u ON u.user_id = n.author_id ".
+                     "LEFT OUTER JOIN `bayonet_users` AS e ON e.user_id = n.edited_id ";
  	if(isset($id)){
  		$query = $query."WHERE n.news_id = '$id' ";
 	}else{
@@ -155,7 +156,7 @@ function getNews($id = NULL, $limit = NULL, $index = 0){
   * Function that takes an array of news and displays it as html
   * @param data - associative array of news from the database
   */  
-function displayNews($data){
+function displayNews($data, $short = false){
 	
 	date_default_timezone_set("America/New_York");
 	
@@ -182,7 +183,19 @@ 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_format($news['message']); ?>
+				<?php 
+					if($short) {
+						echo substr(bbcode_format($news['message']), 0, 1000)."...";
+						echo '<br /><br /><a href="?load=news&id='. $news['news_id'] .'">Continue reading.</a>';
+					} else {
+						echo bbcode_format($news['message']);
+					}
+				?>
+<?php 
+					if(!is_null($news['eauthor'])){ 
+						echo "<br /><div style=\"text-align:right; font-size: 10px; font-style:italic;\">Last edit: ".date('F j, Y, g:i a T', strtotime($news['edited']))." by ".$news['eauthor']."</div>";					
+					}
+?>
 			</div>	
 			<div class="contentFooter">
 				<table width="100%">
@@ -190,7 +203,7 @@ function displayNews($data){
 						<td style="text-align:left;">
 							View Comments: <a href="<?php echo $_SERVER['PHP_SELF']; ?>?load=news&amp;id=<?php echo $news['news_id']; ?>"><?php echo $numComments;?> Comments</a>
 						</td>
-						<td style="text-align:right;">Posted on: <?php echo date('D M j, Y g:i a T', strtotime($news['date'])); ?></td>
+						<td style="text-align:right;">Posted: <?php echo date('D F j, Y, g:i a T', strtotime($news['date'])); ?></td>
 					</tr>
 				</table>
 			</div>
diff --git a/modules/news/index.php b/modules/news/index.php
index 1dfd98a..47688be 100644
--- a/modules/news/index.php
+++ b/modules/news/index.php
@@ -28,6 +28,7 @@ include 'modules/news/functions.php';
 $logged_id = 2;
 
 if(!defined('INDEX_MODULE')){
+	define('BLOCK_RIGHT_DISABLE', true);
 	$page_num = 1;
 	$page_num = $_GET['page']; //get variable for page number
 	
@@ -50,10 +51,11 @@ if(isset($_GET['id']))
 }
 else
 {
-	$news = getNews(null, $limit, $index);
-	displayNews($news);
-	OpenContent();
+
 	if(defined('INDEX_MODULE')){
+		$news = getNews(null, $limit, $index);
+		displayNews($news, true);
+		OpenContent();
 ?>
 		<div style="float:right;">
 			<a href="?load=news">Read All</a>&nbsp;
@@ -61,6 +63,26 @@ else
 
 <?php
 	}else{
+		
+		$news = getNews(null, $limit, $index);
+		
+		OpenContent();
+		if($page_num > 0)
+			echo "&nbsp;<a href=\"?load=news&page={$page_num}\">More Recent News</a>";
+		if(count($news) == $limit){
+?>
+			<div style="float:right;">
+				<a href="?load=news&page=<?php echo ($page_num+2); ?>">Older News</a>&nbsp;
+			</div>
+			<div class="clear"></div>	
+<?php
+		}
+		
+		CloseContent();
+		echo "<br />";
+		displayNews($news);
+		OpenContent();
+		
 		if($page_num > 0)
 			echo "&nbsp;<a href=\"?load=news&page={$page_num}\">More Recent News</a>";