[mxbb-commits] mx_newssuite/includes news.php,1.19,1.20

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

Update of /cvsroot/mxbb/mx_newssuite/includes
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5971/modules/mx_newssuite/includes

Modified Files:
	news.php 
Log Message:
removed some php warnings...

Index: news.php
===================================================================
RCS file: /cvsroot/mxbb/mx_newssuite/includes/news.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** news.php	5 Apr 2006 22:35:24 -0000	1.19
--- news.php	16 Aug 2006 20:29:45 -0000	1.20
***************
*** 18,22 ****
  $is_auth = array();
  
! // 
  // Here we have the (*very* simplified) sql statement ;)
  // I knew there was an easy way :roll:
--- 18,22 ----
  $is_auth = array();
  
! //
  // Here we have the (*very* simplified) sql statement ;)
  // I knew there was an easy way :roll:
***************
*** 24,28 ****
  // Get number of forums in db
  //
! $sql = "SELECT * 
  	FROM " . $news_cat_table . "
  	ORDER BY $cat_extract_order";
--- 24,28 ----
  // Get number of forums in db
  //
! $sql = "SELECT *
  	FROM " . $news_cat_table . "
  	ORDER BY $cat_extract_order";
***************
*** 44,48 ****
  for( $j = 0; $j < ( count( $forums ) ); $j++ )
  {
! 	if ( $news_type_select_data[$item_types_all][$forums[$j][$cool_array_category_id]] )
  	{
  		$topic_show[$j] = $forums[$j][$cool_array_category_id];
--- 44,48 ----
  for( $j = 0; $j < ( count( $forums ) ); $j++ )
  {
! 	if ( isset($news_type_select_data[$item_types_all][$forums[$j][$cool_array_category_id]]) )
  	{
  		$topic_show[$j] = $forums[$j][$cool_array_category_id];
***************
*** 53,57 ****
  	for( $z = 0; $z < ( count( $item_types_array ) ); $z++ )
  	{
! 		if ( $news_type_select_data[$item_types_array[$z]][$forums[$j][$cool_array_category_id]] )
  		{
  			$topic_type[$j] .= $t_commas . $item_types_id_array[$z];
--- 53,57 ----
  	for( $z = 0; $z < ( count( $item_types_array ) ); $z++ )
  	{
! 		if ( isset($news_type_select_data[$item_types_array[$z]][$forums[$j][$cool_array_category_id]]) )
  		{
  			$topic_type[$j] .= $t_commas . $item_types_id_array[$z];
***************
*** 59,64 ****
  		}
  	}
! 	
! 	if ( !empty( $topic_show[$j] ) && $topic_type[$j] != '' ) 
  	{
  
--- 59,64 ----
  		}
  	}
! 
! 	if ( !empty( $topic_show[$j] ) && $topic_type[$j] != '' )
  	{
  
***************
*** 67,72 ****
  			$sql_find = " AND ((
  						" . $item_table_category_id . " = " . $topic_show[$j] . "
! 						AND ( 
! 							" . $item_table_item_type . " in ( " . $topic_type[$j] . " ) 
  						)
  					)";
--- 67,72 ----
  			$sql_find = " AND ((
  						" . $item_table_category_id . " = " . $topic_show[$j] . "
! 						AND (
! 							" . $item_table_item_type . " in ( " . $topic_type[$j] . " )
  						)
  					)";
***************
*** 76,81 ****
  			$sql_find .= " OR (
  						" . $item_table_category_id . " = " . $topic_show[$j] . "
! 						AND ( 
! 							" . $item_table_item_type . " in ( " . $topic_type[$j] . " ) 
  						)
  					)";
--- 76,81 ----
  			$sql_find .= " OR (
  						" . $item_table_category_id . " = " . $topic_show[$j] . "
! 						AND (
! 							" . $item_table_item_type . " in ( " . $topic_type[$j] . " )
  						)
  					)";
***************
*** 92,96 ****
  //
  switch ( $news_sort_method )
! { 
  	case 'Id':
  		$news_sort_method = $item_table_item_id;
--- 92,96 ----
  //
  switch ( $news_sort_method )
! {
  	case 'Id':
  		$news_sort_method = $item_table_item_id;
***************
*** 115,121 ****
  }
  
! $news_today = date('mdY');			 
  switch ( $news_filter_time )
! { 
  	case 'no limit':
  		$news_time_filter_lo = "no";
--- 115,121 ----
  }
  
! $news_today = date('mdY');
  switch ( $news_filter_time )
! {
  	case 'no limit':
  		$news_time_filter_lo = "no";
***************
*** 129,136 ****
  	case '3 days':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 1), intval(substr($news_today, 4, 4)) );
! 		break;	
  	case '1 week':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 7), intval(substr($news_today, 4, 4)) );
! 		break;	
  	case '2 weeks':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 14), intval(substr($news_today, 4, 4)) );
--- 129,136 ----
  	case '3 days':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 1), intval(substr($news_today, 4, 4)) );
! 		break;
  	case '1 week':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 7), intval(substr($news_today, 4, 4)) );
! 		break;
  	case '2 weeks':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 14), intval(substr($news_today, 4, 4)) );
***************
*** 141,145 ****
  	case '1 month':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2) - 1), intval(substr($news_today, 2, 2)), intval(substr($news_today, 4, 4)) );
! 		break;					
  	case '2 months':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2) - 2), intval(substr($news_today, 2, 2)), intval(substr($news_today, 4, 4)) );
--- 141,145 ----
  	case '1 month':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2) - 1), intval(substr($news_today, 2, 2)), intval(substr($news_today, 4, 4)) );
! 		break;
  	case '2 months':
  		$news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2) - 2), intval(substr($news_today, 2, 2)), intval(substr($news_today, 4, 4)) );
***************
*** 180,188 ****
  		//
  		$block_rows[$block]['show_title'] = 0;
! 		$block_rows[$block]['show_block'] = 0;				
! 	} 
  
  	for( $i = 0; $i < @count( $news ); $i++ )
! 	{ 
  		//
  		// Stop from trying to display a non-existant topic and make sure we have
--- 180,188 ----
  		//
  		$block_rows[$block]['show_title'] = 0;
! 		$block_rows[$block]['show_block'] = 0;
! 	}
  
  	for( $i = 0; $i < @count( $news ); $i++ )
! 	{
  		//
  		// Stop from trying to display a non-existant topic and make sure we have
***************
*** 193,198 ****
  			break;
  		}
! 		$newssuite_items[] = $news[$i][$item_id]; 
! 		
  		//
  		// Main part where bbcode is parsed and stuff like that regarding the post text
--- 193,198 ----
  			break;
  		}
! 		$newssuite_items[] = $news[$i][$item_id];
! 
  		//
  		// Main part where bbcode is parsed and stuff like that regarding the post text
***************
*** 205,210 ****
  
  		$user_sig = ( $news[$i]['enable_sig'] && $news[$i]['user_sig'] != '' && $newssuite_config['news_display_signature'] ) ? $news[$i]['user_sig'] : "";
! 		$user_sig_bbcode_uid = $news[$i]['user_sig_bbcode_uid']; 
! 		
  		//
  		// Define censored word matches
--- 205,210 ----
  
  		$user_sig = ( $news[$i]['enable_sig'] && $news[$i]['user_sig'] != '' && $newssuite_config['news_display_signature'] ) ? $news[$i]['user_sig'] : "";
! 		$user_sig_bbcode_uid = $news[$i]['user_sig_bbcode_uid'];
! 
  		//
  		// Define censored word matches
***************
*** 212,217 ****
  		$orig_word = array();
  		$replacement_word = array();
! 		obtain_word_list( $orig_word, $replacement_word ); 
! 		
  		//
  		// Parse smilies
--- 212,217 ----
  		$orig_word = array();
  		$replacement_word = array();
! 		obtain_word_list( $orig_word, $replacement_word );
! 
  		//
  		// Parse smilies
***************
*** 234,239 ****
  		}
  
! 		$message = make_clickable( $message ); 
! 		
  		//
  		// Replace naughty words
--- 234,239 ----
  		}
  
! 		$message = make_clickable( $message );
! 
  		//
  		// Replace naughty words
***************
*** 253,263 ****
  
  		$poster_id = $news[$i]['user_id'];
! 		$poster = $news[$i]['username']; 
! 		
  		//
  		// Edit by info
  		//
  		if ( $newssuite_config['news_display_edit_info'] )
! 		{ 
  			//
  			// Editing information
--- 253,263 ----
  
  		$poster_id = $news[$i]['user_id'];
! 		$poster = $news[$i]['username'];
! 
  		//
  		// Edit by info
  		//
  		if ( $newssuite_config['news_display_edit_info'] )
! 		{
  			//
  			// Editing information
***************
*** 275,280 ****
  		}
  
! 		$message = str_replace( "\n", "\n<br />\n", $message ); 
! 		
  		//
  		// Replace newlines (we use this rather than nl2br because
--- 275,280 ----
  		}
  
! 		$message = str_replace( "\n", "\n<br />\n", $message );
! 
  		//
  		// Replace newlines (we use this rather than nl2br because
***************
*** 286,291 ****
  		}
  
! 		$message = stripslashes( $message ); 
! 		
  		//
  		// OK, do some formatting fixes for the news block :-)
--- 286,291 ----
  		}
  
! 		$message = stripslashes( $message );
! 
  		//
  		// OK, do some formatting fixes for the news block :-)
***************
*** 296,301 ****
  			$message = $message[0];
  			$message .= ' <span> ... :: <a class="gensmall" href="' . append_sid( PHPBB_URL . "viewtopic.$phpEx?t=" . $news[$i]['topic_id'] ) . '">' . $lang['Read more'] . '</a>&nbsp;</span>';
! 		} 
! 		
  		//
  		// truncate text
--- 296,301 ----
  			$message = $message[0];
  			$message .= ' <span> ... :: <a class="gensmall" href="' . append_sid( PHPBB_URL . "viewtopic.$phpEx?t=" . $news[$i]['topic_id'] ) . '">' . $lang['Read more'] . '</a>&nbsp;</span>';
! 		}
! 
  		//
  		// truncate text
***************
*** 305,347 ****
  		$category_title_tmp = ns_truncate_text( $news[$i][$catt_name], $newssuite_config['news_truncate_num_subject'], true );
  		$category_title = $category_title_tmp[0];
! 		$message_tmp = ns_truncate_text( $message, $newssuite_config['news_truncate_num'], true ); 
  		$message = $message_tmp[0];
  
! 		//		
  		// Removes the [toc] and [page] markup
  		//
! 		$message = ns_decode_KB_markup( $message ); 
  
! 		//		
  		// enable/disable html
! 		//		
  		$post_subject = ns_decode_HTML( $post_subject );
  		$message = ns_decode_HTML( $message );
! 		$user_sig = ns_decode_HTML( $user_sig ); 
! 		
! 		//		
  		// replaces common bbcodes with slicker substitutes
! 		//		
  		$post_subject = ns_decode_BBCODE_fixup( $post_subject );
  		$message = ns_decode_BBCODE_fixup( $message );
! 		$user_sig = ns_decode_BBCODE_fixup( $user_sig ); 
! 		
! 		//		
  		// parse bbcode or removes bbcode
! 		//		
  		$post_subject = ns_decode_BBCODE( $post_subject, '', true );
  		$message = ns_decode_BBCODE( $message, $bbcode_uid );
! 		$user_sig = ns_decode_BBCODE( $user_sig, $user_sig_bbcode_uid ); 
! 		
! 		//		
  		// fixup (truncates) urls, images and words for a narrow column layout
! 		//		
  		$post_subject = ns_decode_truncate_fixup( $post_subject );
  		$message = ns_decode_truncate_fixup( $message );
  		$user_sig = ns_decode_truncate_fixup( $user_sig );
! 		
! 		//		
  		// Add reame_more link if truncated
! 		//		
  		$message .= $message_tmp[1] ? readmore_link( $i, $newssuite_config, $news, $item_id, $page_id ) : '';
  
--- 305,347 ----
  		$category_title_tmp = ns_truncate_text( $news[$i][$catt_name], $newssuite_config['news_truncate_num_subject'], true );
  		$category_title = $category_title_tmp[0];
! 		$message_tmp = ns_truncate_text( $message, $newssuite_config['news_truncate_num'], true );
  		$message = $message_tmp[0];
  
! 		//
  		// Removes the [toc] and [page] markup
  		//
! 		$message = ns_decode_KB_markup( $message );
  
! 		//
  		// enable/disable html
! 		//
  		$post_subject = ns_decode_HTML( $post_subject );
  		$message = ns_decode_HTML( $message );
! 		$user_sig = ns_decode_HTML( $user_sig );
! 
! 		//
  		// replaces common bbcodes with slicker substitutes
! 		//
  		$post_subject = ns_decode_BBCODE_fixup( $post_subject );
  		$message = ns_decode_BBCODE_fixup( $message );
! 		$user_sig = ns_decode_BBCODE_fixup( $user_sig );
! 
! 		//
  		// parse bbcode or removes bbcode
! 		//
  		$post_subject = ns_decode_BBCODE( $post_subject, '', true );
  		$message = ns_decode_BBCODE( $message, $bbcode_uid );
! 		$user_sig = ns_decode_BBCODE( $user_sig, $user_sig_bbcode_uid );
! 
! 		//
  		// fixup (truncates) urls, images and words for a narrow column layout
! 		//
  		$post_subject = ns_decode_truncate_fixup( $post_subject );
  		$message = ns_decode_truncate_fixup( $message );
  		$user_sig = ns_decode_truncate_fixup( $user_sig );
! 
! 		//
  		// Add reame_more link if truncated
! 		//
  		$message .= $message_tmp[1] ? readmore_link( $i, $newssuite_config, $news, $item_id, $page_id ) : '';
  
***************
*** 432,441 ****
  
  			$newest_post_img = '<a href="' . topic_last_post_link( $i, $newssuite_config, $news ) . '"><img src="' . $images['newssuite_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>';
! 		} 
  
! 		//		
  		// Types info
  		// KB
! 		//		
  		switch ( $newssuite_config['news_source_switch'] )
  		{
--- 432,441 ----
  
  			$newest_post_img = '<a href="' . topic_last_post_link( $i, $newssuite_config, $news ) . '"><img src="' . $images['newssuite_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>';
! 		}
  
! 		//
  		// Types info
  		// KB
! 		//
  		switch ( $newssuite_config['news_source_switch'] )
  		{
***************
*** 449,453 ****
  				}
  				break;
! 				
  			case 'phpbb';
  
--- 449,453 ----
  				}
  				break;
! 
  			case 'phpbb';
  
***************
*** 465,476 ****
  				}
  				break;
! 		} 
! 		
! 		//		
  		// Assign replacement variables to template
! 		//		
  		$template->assign_block_vars( 'newsrow', array( 'CAT_ID' => intval( $news[$i][$item_cat_id] ),
  				'TOPIC_ID' => intval( $news[$i][$item_id] ),
! 				'TOPIC_TIME' => $topic_time, 
  				'TOPIC_VIEWS' => intval( $news[$i][$item_views] ),
  				'POSTER_NAME' => $poster_name,
--- 465,476 ----
  				}
  				break;
! 		}
! 
! 		//
  		// Assign replacement variables to template
! 		//
  		$template->assign_block_vars( 'newsrow', array( 'CAT_ID' => intval( $news[$i][$item_cat_id] ),
  				'TOPIC_ID' => intval( $news[$i][$item_id] ),
! 				'TOPIC_TIME' => $topic_time,
  				'TOPIC_VIEWS' => intval( $news[$i][$item_views] ),
  				'POSTER_NAME' => $poster_name,
***************
*** 480,489 ****
  				'EDITED_MESSAGE' => $l_edited_by,
  				'NEWS_POLL_DISPLAY' => $poll,
! 				'NEWS_BLOCK_BORDER_STYLE' => $news_block_border_style 
! 				) ); 
! 		
! 		//		
  		// Title info -------------
! 		//		
  		if ( $news_display_block_title )
  		{
--- 480,489 ----
  				'EDITED_MESSAGE' => $l_edited_by,
  				'NEWS_POLL_DISPLAY' => $poll,
! 				'NEWS_BLOCK_BORDER_STYLE' => $news_block_border_style
! 				) );
! 
! 		//
  		// Title info -------------
! 		//
  		if ( $news_display_block_title )
  		{
***************
*** 491,500 ****
  			{
  				$template->assign_block_vars( 'newsrow.news_display_block_title', array( 'NEWS_BLOCK_HEADER_STYLE' => $news_block_header_style,
! 						'TOPIC_TITLE' => $post_subject 
  						) );
  			}
  			else
  			{
! 				$template->assign_block_vars( 'newsrow.news_display_block_title_nostyle', array( 'TOPIC_TITLE' => $post_subject 
  						) );
  			}
--- 491,500 ----
  			{
  				$template->assign_block_vars( 'newsrow.news_display_block_title', array( 'NEWS_BLOCK_HEADER_STYLE' => $news_block_header_style,
! 						'TOPIC_TITLE' => $post_subject
  						) );
  			}
  			else
  			{
! 				$template->assign_block_vars( 'newsrow.news_display_block_title_nostyle', array( 'TOPIC_TITLE' => $post_subject
  						) );
  			}
***************
*** 505,543 ****
  						'TOPIC_LINK' => topic_link( $i, $newssuite_config, $news, $item_id, $page_id ),
  						'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>',
! 						'TOPIC_TITLE' => $post_subject 
  						) );
! 						
  				if ( $news[$i][$item_type] != $news[$i-1][$item_type] || $news[$i][$item_cat_id] != $news[$i-1][$item_cat_id] )
  				{
! 					$template->assign_block_vars( 'newsrow.newspaper_display_title_type_nav', array( 
! 						'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>',	
! 						'TYPE' => $topic_type 
  							) );
! 				}	
  
  			}
  			else
  			{
! 				$template->assign_block_vars( 'newsrow.newspaper_display_title', array( 
! 						'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>',	
! 						'TOPIC_TITLE' => $post_subject 
  						) );
! 				
  				if ( $news[$i][$item_type] != '0' )
  				{
! 					$template->assign_block_vars( 'newsrow.newspaper_display_title_type_nav', array( 
! 						'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>',	
! 						'TYPE' => $topic_type 
  							) );
! 				}							
! 						
  			}
  
! 		
! 		} 
! 		
! 		//		
  		// Footer info --------------------
! 		//		
  		if ( $news_block_footer )
  		{
--- 505,543 ----
  						'TOPIC_LINK' => topic_link( $i, $newssuite_config, $news, $item_id, $page_id ),
  						'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>',
! 						'TOPIC_TITLE' => $post_subject
  						) );
! 
  				if ( $news[$i][$item_type] != $news[$i-1][$item_type] || $news[$i][$item_cat_id] != $news[$i-1][$item_cat_id] )
  				{
! 					$template->assign_block_vars( 'newsrow.newspaper_display_title_type_nav', array(
! 						'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>',
! 						'TYPE' => $topic_type
  							) );
! 				}
  
  			}
  			else
  			{
! 				$template->assign_block_vars( 'newsrow.newspaper_display_title', array(
! 						'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>',
! 						'TOPIC_TITLE' => $post_subject
  						) );
! 
  				if ( $news[$i][$item_type] != '0' )
  				{
! 					$template->assign_block_vars( 'newsrow.newspaper_display_title_type_nav', array(
! 						'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>',
! 						'TYPE' => $topic_type
  							) );
! 				}
! 
  			}
  
! 
! 		}
! 
! 		//
  		// Footer info --------------------
! 		//
  		if ( $news_block_footer )
  		{
***************
*** 549,553 ****
  						'L_COMMENT' => $l_comment,
  						'TOPIC_LINK' => topic_link( $i, $newssuite_config, $news, $item_id, $page_id ),
! 						'TOPIC_LAST_POST_LINK' => topic_last_post_link( $i, $newssuite_config, $news ) 
  						) );
  			}
--- 549,553 ----
  						'L_COMMENT' => $l_comment,
  						'TOPIC_LINK' => topic_link( $i, $newssuite_config, $news, $item_id, $page_id ),
! 						'TOPIC_LAST_POST_LINK' => topic_last_post_link( $i, $newssuite_config, $news )
  						) );
  			}
***************
*** 557,582 ****
  						'READS' => sprintf( $lang['Reads'], $news[$i][$item_views] ),
  						'ORIGINAL_POST' => ' (' . $poster_name . ')',
! 						'LATEST_POST' => $last_post_author . $newest_post_img . ' (' . $last_post_time . ')' 
  						) );
  			}
! 		} 
! 		
! 		//		
  		// Mode switch: Default, Newspager, Category Nav
! 		//		
  		if ( $newssuite_config['news_mode_switch'] != "Default_Block_Mode"  )
! 		{ 
! 			//		
  			// Show only topic titles
! 			//		
  			if ( !$category_nav_mode )
  			{
  				$template->assign_block_vars( 'newsrow.category_nav_off', array(
  						) );
! 			} 
  
! 			//		
  			// Find new category
! 			//		
  			if ( $news[$i][$item_cat_id] != $news[$i-1][$item_cat_id] && $newssuite_config['news_sort_style'] == "Categorized")
  			{
--- 557,582 ----
  						'READS' => sprintf( $lang['Reads'], $news[$i][$item_views] ),
  						'ORIGINAL_POST' => ' (' . $poster_name . ')',
! 						'LATEST_POST' => $last_post_author . $newest_post_img . ' (' . $last_post_time . ')'
  						) );
  			}
! 		}
! 
! 		//
  		// Mode switch: Default, Newspager, Category Nav
! 		//
  		if ( $newssuite_config['news_mode_switch'] != "Default_Block_Mode"  )
! 		{
! 			//
  			// Show only topic titles
! 			//
  			if ( !$category_nav_mode )
  			{
  				$template->assign_block_vars( 'newsrow.category_nav_off', array(
  						) );
! 			}
  
! 			//
  			// Find new category
! 			//
  			if ( $news[$i][$item_cat_id] != $news[$i-1][$item_cat_id] && $newssuite_config['news_sort_style'] == "Categorized")
  			{
***************
*** 587,591 ****
  						'CAT_ID' => intval( $news[$i][$item_cat_id] ),
  						'BLOCK_ID' => intval( $block_id ),
! 						'CATEGORY_URL' => cat_link( $i, $newssuite_config, $news, $item_id, $page_id, $item_cat_id ) 
  						) );
  
--- 587,591 ----
  						'CAT_ID' => intval( $news[$i][$item_cat_id] ),
  						'BLOCK_ID' => intval( $block_id ),
! 						'CATEGORY_URL' => cat_link( $i, $newssuite_config, $news, $item_id, $page_id, $item_cat_id )
  						) );
  
***************
*** 597,602 ****
  				{
  					$template->assign_block_vars( 'newsrow.news_mode_category.switch_cat_link_on', array() );
! 				} 
! 				
  				//
  				// Generate the fold/unfold categories switches
--- 597,602 ----
  				{
  					$template->assign_block_vars( 'newsrow.news_mode_category.switch_cat_link_on', array() );
! 				}
! 
  				//
  				// Generate the fold/unfold categories switches
***************
*** 614,624 ****
  			else if ( $newssuite_config['news_sort_style'] != "Categorized" )
  			{
! 				$template->assign_block_vars( 'newsrow.newspaper_display_category_title', array( 
  						'CATEGORY_TITLE' => $category_title,
! 						'CATEGORY_URL' => cat_link( $i, $newssuite_config, $news, $item_id, $page_id, $item_cat_id ) 
  						) );
  			}
! 		} 
! 		
  		//
  		// Does this topic contain a poll?
--- 614,624 ----
  			else if ( $newssuite_config['news_sort_style'] != "Categorized" )
  			{
! 				$template->assign_block_vars( 'newsrow.newspaper_display_category_title', array(
  						'CATEGORY_TITLE' => $category_title,
! 						'CATEGORY_URL' => cat_link( $i, $newssuite_config, $news, $item_id, $page_id, $item_cat_id )
  						) );
  			}
! 		}
! 
  		//
  		// Does this topic contain a poll?
***************
*** 676,680 ****
  				if ( $user_voted || $view_result || $poll_expired || !$is_auth[$news[$i]['forum_id']]['auth_vote'] || $news[$i]['topic_status'] == TOPIC_LOCKED )
  				{
! 					$template->assign_vars( array( 'L_TOTAL_VOTES' => $lang['Total_votes'] ) 
  						);
  
--- 676,680 ----
  				if ( $user_voted || $view_result || $poll_expired || !$is_auth[$news[$i]['forum_id']]['auth_vote'] || $news[$i]['topic_status'] == TOPIC_LOCKED )
  				{
! 					$template->assign_vars( array( 'L_TOTAL_VOTES' => $lang['Total_votes'] )
  						);
  
***************
*** 689,693 ****
  							'TOTAL_VOTES' => $vote_results_sum,
  
! 							'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id" ) ) 
  						);
  
--- 689,693 ----
  							'TOTAL_VOTES' => $vote_results_sum,
  
! 							'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id" ) )
  						);
  
***************
*** 719,723 ****
  								'POLL_OPTION_IMG_RCAP' => $vote_graphic_img_rcap,
  
! 								'POLL_OPTION_IMG_WIDTH' => $vote_graphic_length ) 
  							);
  					}
--- 719,723 ----
  								'POLL_OPTION_IMG_RCAP' => $vote_graphic_img_rcap,
  
! 								'POLL_OPTION_IMG_WIDTH' => $vote_graphic_length )
  							);
  					}
***************
*** 726,730 ****
  				{
  					$template->assign_vars( array( 'L_SUBMIT_VOTE' => $lang['Submit_vote'],
! 							'L_VIEW_RESULTS' => $lang['View_results'] ) 
  						);
  
--- 726,730 ----
  				{
  					$template->assign_vars( array( 'L_SUBMIT_VOTE' => $lang['Submit_vote'],
! 							'L_VIEW_RESULTS' => $lang['View_results'] )
  						);
  
***************
*** 734,738 ****
  							'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . '=' . $news[$i]['topic_id'] ),
  
! 							'U_VIEW_RESULTS' => append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&amp;' . ( $cat_id ? POST_CAT_URL . '=' . $cat_id . '&amp;' : '' ) . "vote=viewresult" ) ) 
  						);
  
--- 734,738 ----
  							'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . '=' . $news[$i]['topic_id'] ),
  
! 							'U_VIEW_RESULTS' => append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&amp;' . ( $cat_id ? POST_CAT_URL . '=' . $cat_id . '&amp;' : '' ) . "vote=viewresult" ) )
  						);
  
***************
*** 745,749 ****
  
  						$template->assign_block_vars( 'newsrow.switch_poll_vote.poll_option', array( 'POLL_OPTION_ID' => $vote_info[$j]['vote_option_id'],
! 								'POLL_OPTION_CAPTION' => $vote_info[$j]['vote_option_text'] ) 
  							);
  					}
--- 745,749 ----
  
  						$template->assign_block_vars( 'newsrow.switch_poll_vote.poll_option', array( 'POLL_OPTION_ID' => $vote_info[$j]['vote_option_id'],
! 								'POLL_OPTION_CAPTION' => $vote_info[$j]['vote_option_text'] )
  							);
  					}
***************
*** 802,810 ****
  	$temp_tracking_next[$block_id] = $temp_next_url;
  	$temp_tracking_previous[$block_id] = $temp_previous_url;
! 	$temp_tracking_home[$block_id] = 1; 
! 	
  	//
  	// Assign some basic language variables
! 	// 
  	$template->assign_vars( array( 'L_READ_HOME' => $l_read_home,
  			'L_READ_NEXT' => $l_read_next,
--- 802,810 ----
  	$temp_tracking_next[$block_id] = $temp_next_url;
  	$temp_tracking_previous[$block_id] = $temp_previous_url;
! 	$temp_tracking_home[$block_id] = 1;
! 
  	//
  	// Assign some basic language variables
! 	//
  	$template->assign_vars( array( 'L_READ_HOME' => $l_read_home,
  			'L_READ_NEXT' => $l_read_next,
***************
*** 818,822 ****
  			'U_READ_HOME' => $read_home_url . $more_vars,
  			'U_READ_NEXT' => $read_next_url . $more_vars,
! 			'U_READ_PREVIOUS' => $read_previous_url . $more_vars 
  			) );
  
--- 818,822 ----
  			'U_READ_HOME' => $read_home_url . $more_vars,
  			'U_READ_NEXT' => $read_next_url . $more_vars,
! 			'U_READ_PREVIOUS' => $read_previous_url . $more_vars
  			) );