[mxbb-commits] core/modules/mx_coreblocks mx_forum.php,1.5,1.6

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24437

Modified Files:
	mx_forum.php 
Log Message:
Fixed some named array with non-quoted indexes and code layout.
Added use of new mx_request_vars class.

Index: mx_forum.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_forum.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mx_forum.php	9 Jan 2005 21:55:44 -0000	1.5
--- mx_forum.php	19 Apr 2005 20:43:21 -0000	1.6
***************
*** 21,49 ****
   *    (at your option) any later version.
   */
!  
! if ( !defined( 'IN_PORTAL' ) )
  {
! 	define( 'IN_PORTAL', 1 );
! 	$mx_root_path = "./";
  
  	$include_page_tail = 1;
  
! 	include( $mx_root_path . 'extension.inc' );
! 	include( $mx_root_path . 'common.' . $phpEx ); 
! 	
! 	// Start session management
! 	
! 	$userdata = session_pagestart( $user_ip, PAGE_FORUM );
! 	mx_init_userprefs( $userdata ); 
! 	
! 	// End session management
! 	
  }
  
! $viewcat = ( !empty( $HTTP_GET_VARS[POST_CAT_URL] ) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1;
  
! if ( isset( $HTTP_GET_VARS['mark'] ) || isset( $HTTP_POST_VARS['mark'] ) )
  {
! 	$mark_read = ( isset( $HTTP_POST_VARS['mark'] ) ) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark'];
  }
  else
--- 21,56 ----
   *    (at your option) any later version.
   */
! 
! if ( !defined('IN_PORTAL') )
  {
! 	define('IN_PORTAL', 1);
! 	$mx_root_path = './';
  
  	$include_page_tail = 1;
  
! 	include($mx_root_path . 'extension.inc');
! 	include($mx_root_path . 'common.' . $phpEx);
! 
! 	$userdata = session_pagestart($user_ip, PAGE_FORUM);
! 	mx_init_userprefs($userdata); 
  }
  
! // ================================================================================
! // The following code is based on includes/page_header.php (phpBB 2.0.14)
! // ================================================================================
  
! $l_timezone = explode('.', $board_config['board_timezone']);
! $l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])];
! 
! 
! // ================================================================================
! // The following code is based on index.php (phpBB 2.0.14)
! // ================================================================================
! 
! $viewcat = ( !empty($HTTP_GET_VARS[POST_CAT_URL]) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1;
! 
! if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) )
  {
! 	$mark_read = ( isset($HTTP_POST_VARS['mark']) ) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark'];
  }
  else
***************
*** 52,91 ****
  }
  
  // Handle marking posts
! 
! if ( $mark_read == 'forums' )
  {
! 	if ( $userdata['session_logged_in'] )
  	{
! 		setcookie( $board_config['cookie_name'] . '_f_all', time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure'] );
  	}
  
! 	$template->assign_vars( array( "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid( PORTAL_URL . "index.$phpEx" ) . '">' ) 
! 		);
  
! 	$message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( PORTAL_URL . "index.$phpEx" ) . '">', '</a> ' );
  
! 	mx_message_die( GENERAL_MESSAGE, $message );
  }
! 
  // End handle marking posts
  
! $tracking_topics = ( isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t'] ) ) ? unserialize( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"] ) : array();
! $tracking_forums = ( isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f'] ) ) ? unserialize( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"] ) : array();
  
  // If you don't use these stats on your index you may want to consider
  // removing them
! 
! $total_posts = get_db_stat( 'postcount' );
! $total_users = get_db_stat( 'usercount' );
! $newest_userdata = get_db_stat( 'newestuser' );
  $newest_user = $newest_userdata['username'];
  $newest_uid = $newest_userdata['user_id'];
  
! if ( $total_posts == 0 )
  {
  	$l_total_post_s = $lang['Posted_articles_zero_total'];
  }
! else if ( $total_posts == 1 )
  {
  	$l_total_post_s = $lang['Posted_article_total'];
--- 59,102 ----
  }
  
+ //
  // Handle marking posts
! //
! if( $mark_read == 'forums' )
  {
! 	if( $userdata['session_logged_in'] )
  	{
! 		setcookie($board_config['cookie_name'] . '_f_all', time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
  	}
  
! 	$template->assign_vars(array(
! 		"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "index.$phpEx") . '">' )
! 	);
  
! 	$message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx") . '">', '</a> ');
  
! 	mx_message_die(GENERAL_MESSAGE, $message);
  }
! //
  // End handle marking posts
+ //
  
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
  
+ //
  // If you don't use these stats on your index you may want to consider
  // removing them
! //
! $total_posts = get_db_stat('postcount');
! $total_users = get_db_stat('usercount');
! $newest_userdata = get_db_stat('newestuser');
  $newest_user = $newest_userdata['username'];
  $newest_uid = $newest_userdata['user_id'];
  
! if( $total_posts == 0 )
  {
  	$l_total_post_s = $lang['Posted_articles_zero_total'];
  }
! else if( $total_posts == 1 )
  {
  	$l_total_post_s = $lang['Posted_article_total'];
***************
*** 96,104 ****
  }
  
! if ( $total_users == 0 )
  {
  	$l_total_user_s = $lang['Registered_users_zero_total'];
  }
! else if ( $total_users == 1 )
  {
  	$l_total_user_s = $lang['Registered_user_total'];
--- 107,115 ----
  }
  
! if( $total_users == 0 )
  {
  	$l_total_user_s = $lang['Registered_users_zero_total'];
  }
! else if( $total_users == 1 )
  {
  	$l_total_user_s = $lang['Registered_user_total'];
***************
*** 109,295 ****
  }
  
- // Start page proper
  
  $sql = "SELECT c.cat_id, c.cat_title, c.cat_order
!   FROM " . CATEGORIES_TABLE . " c 
!   ORDER BY c.cat_order";
! if ( !( $result = $db->sql_query( $sql ) ) )
  {
! 	mx_message_die( GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql );
  }
  
! while ( $category_rows[] = $db->sql_fetchrow( $result ) );
  
! if ( ( $total_categories = count( $category_rows ) ) )
  { 
! 	
  	// Define appropriate SQL
! 	
! 	switch ( SQL_LAYER )
  	{
  		case 'postgresql':
! 			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id
!         FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u
!         WHERE p.post_id = f.forum_last_post_id 
!           AND u.user_id = p.poster_id  
!           UNION (
!             SELECT f.*, NULL, NULL, NULL, NULL
!             FROM " . FORUMS_TABLE . " f
!             WHERE NOT EXISTS (
!               SELECT p.post_time
!               FROM " . POSTS_TABLE . " p
!               WHERE p.post_id = f.forum_last_post_id  
!             )
!           )
!           ORDER BY cat_id, forum_order";
  			break;
  
  		case 'oracle':
! 			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id
!         FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u
!         WHERE p.post_id = f.forum_last_post_id(+)
!           AND u.user_id = p.poster_id(+)
!         ORDER BY f.cat_id, f.forum_order";
  			break;
  
  		default:
  			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id
!         FROM (( " . FORUMS_TABLE . " f
!         LEFT JOIN " . POSTS_TABLE . " p ON p.post_id = f.forum_last_post_id )
!         LEFT JOIN " . USERS_TABLE . " u ON u.user_id = p.poster_id )
!         ORDER BY f.cat_id, f.forum_order";
  			break;
  	}
! 	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not query forums information', '', __LINE__, __FILE__, $sql );
  	}
  
  	$forum_data = array();
! 	while ( $row = $db->sql_fetchrow( $result ) )
  	{
  		$forum_data[] = $row;
  	}
  
! 	if ( !( $total_forums = count( $forum_data ) ) )
  	{
! 		mx_message_die( GENERAL_MESSAGE, $lang['No_forums'] );
  	} 
! 	
  	// Obtain a list of topic ids which contain
  	// posts made since user last visited
! 	
  	if ( $userdata['session_logged_in'] )
  	{
! 		$sql = "SELECT t.forum_id, t.topic_id, p.post_time
!       FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p 
!       WHERE p.post_id = t.topic_last_post_id 
!         AND p.post_time > " . $userdata['user_lastvisit'] . " 
!         AND t.topic_moved_id = 0";
! 		if ( !( $result = $db->sql_query( $sql ) ) )
  		{
! 			mx_message_die( GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql );
  		}
  
  		$new_topic_data = array();
! 		while ( $topic_data = $db->sql_fetchrow( $result ) )
  		{
  			$new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time'];
  		}
  	} 
! 	
  	// Obtain list of moderators of each forum
  	// First users, then groups ... broken into two queries
! 	
! 	$sql = "SELECT aa.forum_id, u.user_id, u.username
!     FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
!     WHERE aa.auth_mod = " . true . " 
!       AND g.group_single_user = 1 
!       AND ug.group_id = aa.group_id 
!       AND g.group_id = aa.group_id 
!       AND u.user_id = ug.user_id 
!     GROUP BY u.user_id, u.username, aa.forum_id 
!     ORDER BY aa.forum_id, u.user_id";
! 	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql );
  	}
  
  	$forum_moderators = array();
! 	while ( $row = $db->sql_fetchrow( $result ) )
  	{
! 		$forum_moderators[$row['forum_id']][] = '<a href="' . append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id'] ) . '">' . $row['username'] . '</a>';
  	}
  
! 	$sql = "SELECT aa.forum_id, g.group_id, g.group_name
!     FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g 
!     WHERE aa.auth_mod = " . true . " 
!       AND g.group_single_user = 0 
!       AND g.group_type <> " . GROUP_HIDDEN . "
!       AND ug.group_id = aa.group_id 
!       AND g.group_id = aa.group_id 
!     GROUP BY g.group_id, g.group_name, aa.forum_id 
!     ORDER BY aa.forum_id, g.group_id";
! 	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql );
  	}
  
! 	while ( $row = $db->sql_fetchrow( $result ) )
  	{
! 		$forum_moderators[$row['forum_id']][] = '<a href="' . append_sid( PHPBB_URL . "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id'] ) . '">' . $row['group_name'] . '</a>';
  	} 
! 	
  	// Find which forums are visible for this user
! 	
  	$is_auth_ary = array();
! 	$is_auth_ary = auth( AUTH_VIEW, AUTH_LIST_ALL, $userdata, $forum_data ); 
! 	
  	// Start output of page
! 	
! 	$template->set_filenames( array( 'block_forum' => 'mx_forum.tpl' ) 
! 		);
  
! 	$template->assign_vars( array( 'BLOCK_SIZE' => $block_size,
! 			'TOTAL_POSTS' => sprintf( $l_total_post_s, $total_posts ),
! 			'TOTAL_USERS' => sprintf( $l_total_user_s, $total_users ),
! 			'NEWEST_USER' => sprintf( $lang['Newest_user'], '<a href="' . append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$newest_uid" ) . '">', $newest_user, '</a>' ),
  
! 			'FORUM_IMG' => $images['forum'],
! 			'FORUM_NEW_IMG' => $images['forum_new'],
! 			'FORUM_LOCKED_IMG' => $images['forum_locked'],
  
! 			'U_PHPBB_ROOT_PATH' => PHPBB_URL,
! 			'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,
  
! 			'L_FORUM' => $lang['Forum'],
! 			'L_TOPICS' => $lang['Topics'],
! 			'L_REPLIES' => $lang['Replies'],
! 			'L_VIEWS' => $lang['Views'],
! 			'L_POSTS' => $lang['Posts'],
! 			'L_LASTPOST' => $lang['Last_Post'],
! 			'L_NO_NEW_POSTS' => $lang['No_new_posts'],
! 			'L_NEW_POSTS' => $lang['New_posts'],
! 			'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'],
! 			'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'],
! 			'L_ONLINE_EXPLAIN' => $lang['Online_explain'],
  
! 			'L_MODERATOR' => $lang['Moderators'],
! 			'L_FORUM_LOCKED' => $lang['Forum_is_locked'],
! 			'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'],
  
! 			'U_MARK_READ' => append_sid( PORTAL_URL . "mx_forum.$phpEx?mark=forums" ) 
! 			) ); 
! 	
  	// Okay, let's build the index
! 	
! 	for( $i = 0; $i < $total_categories; $i++ )
  	{
  		$cat_id = $category_rows[$i]['cat_id']; 
! 		
  		// Should we display this category/forum set?
! 		
  		$display_forums = false;
! 		for( $j = 0; $j < $total_forums; $j++ )
  		{
  			if ( $is_auth_ary[$forum_data[$j]['forum_id']]['auth_view'] && $forum_data[$j]['cat_id'] == $cat_id )
--- 120,323 ----
  }
  
  
+ //
+ // Start page proper
+ //
  $sql = "SELECT c.cat_id, c.cat_title, c.cat_order
! 	FROM " . CATEGORIES_TABLE . " c
! 	ORDER BY c.cat_order";
! if( !($result = $db->sql_query($sql)) )
  {
! 	mx_message_die(GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql);
  }
  
! $category_rows = array();
! while( $category_rows[] = $db->sql_fetchrow($result) );
! $db->sql_freeresult($result);
  
! if( ( $total_categories = count($category_rows) ) )
  { 
! 	//
  	// Define appropriate SQL
! 	//
! 	switch(SQL_LAYER)
  	{
  		case 'postgresql':
! 			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id 
! 				FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u
! 				WHERE p.post_id = f.forum_last_post_id 
! 					AND u.user_id = p.poster_id  
! 					UNION (
! 						SELECT f.*, NULL, NULL, NULL, NULL
! 						FROM " . FORUMS_TABLE . " f
! 						WHERE NOT EXISTS (
! 							SELECT p.post_time
! 							FROM " . POSTS_TABLE . " p
! 							WHERE p.post_id = f.forum_last_post_id  
! 						)
! 					)
! 					ORDER BY cat_id, forum_order";
  			break;
  
  		case 'oracle':
! 			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id 
! 				FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u
! 				WHERE p.post_id = f.forum_last_post_id(+)
! 					AND u.user_id = p.poster_id(+)
! 				ORDER BY f.cat_id, f.forum_order";
  			break;
  
  		default:
  			$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id
! 				FROM (( " . FORUMS_TABLE . " f
! 				LEFT JOIN " . POSTS_TABLE . " p ON p.post_id = f.forum_last_post_id )
! 				LEFT JOIN " . USERS_TABLE . " u ON u.user_id = p.poster_id )
! 				ORDER BY f.cat_id, f.forum_order";
  			break;
  	}
! 	if ( !($result = $db->sql_query($sql)) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not query forums information', '', __LINE__, __FILE__, $sql);
  	}
  
  	$forum_data = array();
! 	while( $row = $db->sql_fetchrow($result) )
  	{
  		$forum_data[] = $row;
  	}
+ 	$db->sql_freeresult($result);
  
! 	if ( !($total_forums = count($forum_data)) )
  	{
! 		mx_message_die(GENERAL_MESSAGE, $lang['No_forums']);
  	} 
! 
! 	//
  	// Obtain a list of topic ids which contain
  	// posts made since user last visited
! 	//
  	if ( $userdata['session_logged_in'] )
  	{
! 		$sql = "SELECT t.forum_id, t.topic_id, p.post_time 
! 			FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p 
! 			WHERE p.post_id = t.topic_last_post_id 
! 				AND p.post_time > " . $userdata['user_lastvisit'] . " 
! 				AND t.topic_moved_id = 0"; 
! 		if ( !($result = $db->sql_query($sql)) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql);
  		}
  
  		$new_topic_data = array();
! 		while( $topic_data = $db->sql_fetchrow($result) )
  		{
  			$new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time'];
  		}
+ 		$db->sql_freeresult($result);
  	} 
! 
! 	//
  	// Obtain list of moderators of each forum
  	// First users, then groups ... broken into two queries
! 	//
! 	$sql = "SELECT aa.forum_id, u.user_id, u.username 
! 		FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
! 		WHERE aa.auth_mod = " . TRUE . " 
! 			AND g.group_single_user = 1 
! 			AND ug.group_id = aa.group_id 
! 			AND g.group_id = aa.group_id 
! 			AND u.user_id = ug.user_id 
! 		GROUP BY u.user_id, u.username, aa.forum_id 
! 		ORDER BY aa.forum_id, u.user_id";
! 	if ( !($result = $db->sql_query($sql)) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql);
  	}
  
  	$forum_moderators = array();
! 	while( $row = $db->sql_fetchrow($result) )
  	{
! 		$forum_moderators[$row['forum_id']][] = '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $row['username'] . '</a>';
  	}
+ 	$db->sql_freeresult($result);
  
! 	$sql = "SELECT aa.forum_id, g.group_id, g.group_name 
! 		FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g 
! 		WHERE aa.auth_mod = " . TRUE . " 
! 			AND g.group_single_user = 0 
! 			AND g.group_type <> " . GROUP_HIDDEN . "
! 			AND ug.group_id = aa.group_id 
! 			AND g.group_id = aa.group_id 
! 		GROUP BY g.group_id, g.group_name, aa.forum_id 
! 		ORDER BY aa.forum_id, g.group_id";
! 	if ( !($result = $db->sql_query($sql)) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql);
  	}
  
! 	while( $row = $db->sql_fetchrow($result) )
  	{
! 		$forum_moderators[$row['forum_id']][] = '<a href="' . append_sid(PHPBB_URL . "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id']) . '">' . $row['group_name'] . '</a>';
  	} 
! 	$db->sql_freeresult($result);
! 
! 	//
  	// Find which forums are visible for this user
! 	//
  	$is_auth_ary = array();
! 	$is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata, $forum_data);
! 
! 	//
  	// Start output of page
! 	//
! 	$template->set_filenames(array(
! 		'block_forum' => 'mx_forum.tpl')
! 	);
  
! 	$template->assign_vars(array(
! 		'BLOCK_SIZE' => $block_size,
! 		'U_PHPBB_ROOT_PATH' => PHPBB_URL,
! 		'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,
! 		'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
  
! 		'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts),
! 		'TOTAL_USERS' => sprintf($l_total_user_s, $total_users),
! 		'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'),
  
! 		'FORUM_IMG' => $images['forum'],
! 		'FORUM_NEW_IMG' => $images['forum_new'],
! 		'FORUM_LOCKED_IMG' => $images['forum_locked'],
  
! 		'L_FORUM' => $lang['Forum'],
! 		'L_TOPICS' => $lang['Topics'],
! 		'L_REPLIES' => $lang['Replies'],
! 		'L_VIEWS' => $lang['Views'],
! 		'L_POSTS' => $lang['Posts'],
! 		'L_LASTPOST' => $lang['Last_Post'],
! 		'L_NO_NEW_POSTS' => $lang['No_new_posts'],
! 		'L_NEW_POSTS' => $lang['New_posts'],
! 		'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'],
! 		'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'],
! 		'L_ONLINE_EXPLAIN' => $lang['Online_explain'],
  
! 		'L_MODERATOR' => $lang['Moderators'],
! 		'L_FORUM_LOCKED' => $lang['Forum_is_locked'],
! 		'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'],
  
! 		'U_MARK_READ' => append_sid(PORTAL_URL . "mx_forum.$phpEx?mark=forums"))
! 	);
! 
! 	//
  	// Okay, let's build the index
! 	//
! 	for($i = 0; $i < $total_categories; $i++)
  	{
  		$cat_id = $category_rows[$i]['cat_id']; 
! 
! 		//
  		// Should we display this category/forum set?
! 		//
  		$display_forums = false;
! 		for($j = 0; $j < $total_forums; $j++)
  		{
  			if ( $is_auth_ary[$forum_data[$j]['forum_id']]['auth_view'] && $forum_data[$j]['cat_id'] == $cat_id )
***************
*** 297,315 ****
  				$display_forums = true;
  			}
! 		} 
! 		
  		// Yes, we should, so first dump out the category
  		// title, then, if appropriate the forum list
! 		
  		if ( $display_forums )
  		{
! 			$template->assign_block_vars( 'catrow', array( 'CAT_ID' => $cat_id,
! 					'CAT_DESC' => $category_rows[$i]['cat_title'],
! 					'U_VIEWCAT' => append_sid( PHPBB_URL . "index.$phpEx?" . POST_CAT_URL . "=$cat_id" ) 
! 					) );
  
  			if ( $viewcat == $cat_id || $viewcat == -1 )
  			{
! 				for( $j = 0; $j < $total_forums; $j++ )
  				{
  					if ( $forum_data[$j]['cat_id'] == $cat_id )
--- 325,345 ----
  				$display_forums = true;
  			}
! 		}
! 
! 		//
  		// Yes, we should, so first dump out the category
  		// title, then, if appropriate the forum list
! 		//
  		if ( $display_forums )
  		{
! 			$template->assign_block_vars('catrow', array(
! 				'CAT_ID' => $cat_id,
! 				'CAT_DESC' => $category_rows[$i]['cat_title'],
! 				'U_VIEWCAT' => append_sid(PHPBB_URL . "index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
! 			);
  
  			if ( $viewcat == $cat_id || $viewcat == -1 )
  			{
! 				for($j = 0; $j < $total_forums; $j++)
  				{
  					if ( $forum_data[$j]['cat_id'] == $cat_id )
***************
*** 329,342 ****
  								if ( $userdata['session_logged_in'] )
  								{
! 									if ( !empty( $new_topic_data[$forum_id] ) )
  									{
  										$forum_last_post_time = 0;
  
! 										while ( list( $check_topic_id, $check_post_time ) = @each( $new_topic_data[$forum_id] ) )
  										{
! 											if ( empty( $tracking_topics[$check_topic_id] ) )
  											{
  												$unread_topics = true;
! 												$forum_last_post_time = max( $check_post_time, $forum_last_post_time );
  											}
  											else
--- 359,373 ----
  								if ( $userdata['session_logged_in'] )
  								{
! 									if ( !empty($new_topic_data[$forum_id]) )
  									{
  										$forum_last_post_time = 0;
  
! 										while( list($check_topic_id, $check_post_time) = @each($new_topic_data[$forum_id]) )
  										{
! 											if ( empty($tracking_topics[$check_topic_id]) )
  											{
  												$unread_topics = true;
! 												$forum_last_post_time = max($check_post_time, $forum_last_post_time);
! 
  											}
  											else
***************
*** 345,354 ****
  												{
  													$unread_topics = true;
! 													$forum_last_post_time = max( $check_post_time, $forum_last_post_time );
  												}
  											}
  										}
  
! 										if ( !empty( $tracking_forums[$forum_id] ) )
  										{
  											if ( $tracking_forums[$forum_id] > $forum_last_post_time )
--- 376,385 ----
  												{
  													$unread_topics = true;
! 													$forum_last_post_time = max($check_post_time, $forum_last_post_time);
  												}
  											}
  										}
  
! 										if ( !empty($tracking_forums[$forum_id]) )
  										{
  											if ( $tracking_forums[$forum_id] > $forum_last_post_time )
***************
*** 358,362 ****
  										}
  
! 										if ( isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] ) )
  										{
  											if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time )
--- 389,393 ----
  										}
  
! 										if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
  										{
  											if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time )
***************
*** 365,368 ****
--- 396,400 ----
  											}
  										}
+ 
  									}
  								}
***************
*** 377,387 ****
  							if ( $forum_data[$j]['forum_last_post_id'] )
  							{
! 								$last_post_time = create_date( $board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone'] );
  
  								$last_post = $last_post_time . '<br />';
  
! 								$last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ( $forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $forum_data[$j]['user_id'] ) . '">' . $forum_data[$j]['username'] . '</a> ';
  
! 								$last_post .= '<a href="' . append_sid( PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id'] ) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . PHPBB_URL . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>';
  							}
  							else
--- 409,419 ----
  							if ( $forum_data[$j]['forum_last_post_id'] )
  							{
! 								$last_post_time = create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']);
  
  								$last_post = $last_post_time . '<br />';
  
! 								$last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> ';
  
! 								$last_post .= '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . PHPBB_URL . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>';
  							}
  							else
***************
*** 390,397 ****
  							}
  
! 							if ( count( $forum_moderators[$forum_id] ) > 0 )
  							{
! 								$l_moderators = ( count( $forum_moderators[$forum_id] ) == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
! 								$moderator_list = implode( ', ', $forum_moderators[$forum_id] );
  							}
  							else
--- 422,429 ----
  							}
  
! 							if ( count($forum_moderators[$forum_id]) > 0 )
  							{
! 								$l_moderators = ( count($forum_moderators[$forum_id]) == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
! 								$moderator_list = implode(', ', $forum_moderators[$forum_id]);
  							}
  							else
***************
*** 401,422 ****
  							}
  
! 							$row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2'];
! 							$row_class = ( !( $i % 2 ) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 							$template->assign_block_vars( 'catrow.forumrow', array( 'ROW_COLOR' => '#' . $row_color,
! 									'ROW_CLASS' => $row_class,
! 									'FORUM_FOLDER_IMG' => $folder_image,
! 									'FORUM_NAME' => $forum_data[$j]['forum_name'],
! 									'FORUM_DESC' => $forum_data[$j]['forum_desc'],
! 									'POSTS' => $forum_data[$j]['forum_posts'],
! 									'TOPICS' => $forum_data[$j]['forum_topics'],
! 									'LAST_POST' => $last_post,
! 									'MODERATORS' => $moderator_list,
  
! 									'L_MODERATOR' => $l_moderators,
! 									'L_FORUM_FOLDER_ALT' => $folder_alt,
  
! 									'U_VIEWFORUM' => append_sid( PHPBB_URL . "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id" ) 
! 									) );
  						}
  					}
--- 433,455 ----
  							}
  
! 							$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! 							$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 							$template->assign_block_vars('catrow.forumrow', array(
! 								'ROW_COLOR' => '#' . $row_color,
! 								'ROW_CLASS' => $row_class,
! 								'FORUM_FOLDER_IMG' => $folder_image,
! 								'FORUM_NAME' => $forum_data[$j]['forum_name'],
! 								'FORUM_DESC' => $forum_data[$j]['forum_desc'],
! 								'POSTS' => $forum_data[$j]['forum_posts'],
! 								'TOPICS' => $forum_data[$j]['forum_topics'],
! 								'LAST_POST' => $last_post,
! 								'MODERATORS' => $moderator_list,
  
! 								'L_MODERATOR' => $l_moderators,
! 								'L_FORUM_FOLDER_ALT' => $folder_alt,
  
! 								'U_VIEWFORUM' => append_sid(PHPBB_URL . "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
! 							);
  						}
  					}
***************
*** 425,450 ****
  		}
  	} // for ... categories
! } // if ... total_categories
  else
  {
! 	mx_message_die( GENERAL_MESSAGE, $lang['No_forums'] );
  }
  
  // Generate the page
! 
! if ( !empty( $include_page_tail ) )
  {
! 	$page_title = ( !empty( $lang['Forum'] ) ? $lang['Forum'] : 'Forum' );
! 	include( $mx_root_path . 'includes/page_header.' . $phpEx );
  }
  
! $template->pparse( 'block_forum' );
! 
! $template->destroy();
  
! if ( !empty( $include_page_tail ) )
  {
! 	include( $mx_root_path . 'includes/page_tail.' . $phpEx );
! 	unset( $include_page_tail );
  }
  
--- 458,483 ----
  		}
  	} // for ... categories
! 
! }// if ... total_categories
  else
  {
! 	mx_message_die(GENERAL_MESSAGE, $lang['No_forums']);
  }
  
+ //
  // Generate the page
! //
! if ( isset($include_page_tail) )
  {
! 	$page_title = ( !empty($lang['Forum']) ? $lang['Forum'] : 'Forum' );
! 	include($mx_root_path . 'includes/page_header.' . $phpEx);
  }
  
! $template->pparse('block_forum');
  
! if ( isset($include_page_tail) )
  {
! 	include($mx_root_path . 'includes/page_tail.' . $phpEx);
! 	unset($include_page_tail);
  }