[mxbb-commits] core/modules/mx_phpbb3blocks/includes mx_functions_display.php, 1.9, 1.10

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6321

Modified Files:
	mx_functions_display.php 
Log Message:
http://www.mx-publisher.com/phpBB2/viewtopic.php?p=65197#65197
Massive update.

Index: mx_functions_display.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes/mx_functions_display.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mx_functions_display.php	5 Oct 2008 05:30:32 -0000	1.9
--- mx_functions_display.php	31 Oct 2008 18:56:03 -0000	1.10
***************
*** 33,42 ****
  	global $db, $phpbb_auth, $mx_user, $template;
  	global $phpbb_root_path, $phpEx, $board_config;
! 	global $mx_request_vars, $phpBB3;
  
  	$forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array();
  	$parent_id = $visible_forums = 0;
  	$sql_from = '';
! 	
  	// Mark forums read?
  	$mark_read = $mx_request_vars->request('mark', MX_TYPE_NO_TAGS, '');
--- 33,42 ----
  	global $db, $phpbb_auth, $mx_user, $template;
  	global $phpbb_root_path, $phpEx, $board_config;
! 	global $mx_request_vars;
  
  	$forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array();
  	$parent_id = $visible_forums = 0;
  	$sql_from = '';
! 
  	// Mark forums read?
  	$mark_read = $mx_request_vars->request('mark', MX_TYPE_NO_TAGS, '');
***************
*** 404,413 ****
  			}
  		}
! 		
  		//
  		//This was someting that MX-Publisher template sytsem didn't supported so S_LAST_CAT was introduced fom S_NO_CAT
  		//The template shold be changed allso ;)
  		//
! 		
  		$template->assign_block_vars('forumrow', array(
  			'S_IS_CAT'			=> false,
--- 404,413 ----
  			}
  		}
! 
  		//
  		//This was someting that MX-Publisher template sytsem didn't supported so S_LAST_CAT was introduced fom S_NO_CAT
  		//The template shold be changed allso ;)
  		//
! 
  		$template->assign_block_vars('forumrow', array(
  			'S_IS_CAT'			=> false,
***************
*** 428,432 ****
  			'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $mx_user->lang[$folder_alt] . '" />' : '',
  			'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
! 			'LAST_POST_SUBJECT'		=> $phpBB3->censor_text($last_post_subject),
  			'LAST_POST_TIME'		=> $last_post_time,
  			'LAST_POSTER'			=> mx_get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
--- 428,432 ----
  			'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $mx_user->lang[$folder_alt] . '" />' : '',
  			'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
! 			'LAST_POST_SUBJECT'		=> phpBB3::censor_text($last_post_subject),
  			'LAST_POST_TIME'		=> $last_post_time,
  			'LAST_POSTER'			=> mx_get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
***************
*** 454,458 ****
  			);
  		}
! 		
  		$last_catless = $catless;
  	}
--- 454,458 ----
  			);
  		}
! 
  		$last_catless = $catless;
  	}
***************
*** 888,892 ****
  {
  	global $phpbb_auth, $template, $db, $mx_user;
! 	global $phpbb_root_path, $phpEx, $phpBB3;
  
  	// Do not display user activity for users having more than 5000 posts...
--- 888,892 ----
  {
  	global $phpbb_auth, $template, $db, $mx_user;
! 	global $phpbb_root_path, $phpEx;
  
  	// Do not display user activity for users having more than 5000 posts...
***************
*** 983,987 ****
  		'ACTIVE_FORUM_POSTS'	=> ($active_f_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_f_count),
  		'ACTIVE_FORUM_PCT'		=> sprintf($l_active_pct, $active_f_pct),
! 		'ACTIVE_TOPIC'			=> $phpBB3->censor_text($active_t_name),
  		'ACTIVE_TOPIC_POSTS'	=> ($active_t_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_t_count),
  		'ACTIVE_TOPIC_PCT'		=> sprintf($l_active_pct, $active_t_pct),
--- 983,987 ----
  		'ACTIVE_FORUM_POSTS'	=> ($active_f_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_f_count),
  		'ACTIVE_FORUM_PCT'		=> sprintf($l_active_pct, $active_f_pct),
! 		'ACTIVE_TOPIC'			=> phpBB3::censor_text($active_t_name),
  		'ACTIVE_TOPIC_POSTS'	=> ($active_t_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_t_count),
  		'ACTIVE_TOPIC_PCT'		=> sprintf($l_active_pct, $active_t_pct),
***************
*** 1234,1239 ****
  	if (empty($ranks))
  	{
! 		global $mx_cache;
! 		$ranks = $mx_cache->obtain_ranks();
  	}
  
--- 1234,1239 ----
  	if (empty($ranks))
  	{
! 		global $mx_backend;
! 		$ranks = $mx_backend->obtain_ranks();
  	}