[mxbb-commits] core/modules/mx_coreblocks mx_forum.php,1.7,1.8 mx_poll.php,1.21,1.22 mx_search.php,1.5,1.6

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

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

Modified Files:
	mx_forum.php mx_poll.php mx_search.php 
Log Message:
updated for phpBB 2.0.17

Index: mx_poll.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_poll.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mx_poll.php	6 Sep 2005 18:51:57 -0000	1.21
--- mx_poll.php	10 Sep 2005 22:08:24 -0000	1.22
***************
*** 165,170 ****
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		$block_rows[$block]['show_title'] = 0;
! 		$block_rows[$block]['show_block'] = 0;
  		return;	//message_die(GENERAL_ERROR, "Could not obtain vote data for this topic", '', __LINE__, __FILE__, $sql);
  	}
--- 165,170 ----
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		$mx_block->show_title = false;
! 		$mx_block->show_block = false;
  		return;	//message_die(GENERAL_ERROR, "Could not obtain vote data for this topic", '', __LINE__, __FILE__, $sql);
  	}
***************
*** 184,189 ****
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			$block_rows[$block]['show_title'] = 0;
! 			$block_rows[$block]['show_block'] = 0;
  			return;	//message_die(GENERAL_ERROR, "Could not obtain user vote data for this topic", '', __LINE__, __FILE__, $sql);
  		}
--- 184,189 ----
  		if ( !($result = $db->sql_query($sql)) )
  		{
! 			$mx_block->show_title = false;
! 			$mx_block->show_block = false;
  			return;	//message_die(GENERAL_ERROR, "Could not obtain user vote data for this topic", '', __LINE__, __FILE__, $sql);
  		}

Index: mx_search.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mx_search.php	26 Apr 2005 00:08:17 -0000	1.5
--- mx_search.php	10 Sep 2005 22:08:24 -0000	1.6
***************
*** 140,143 ****
--- 140,149 ----
  				for( $i = 0; $i < count( $split_search ); $i++ )
  				{
+ 					if (preg_match('#^[\*%]+$#', trim($split_search[$i])) || preg_match('#^[^\*]{1,2}$#', str_replace(array('*', '%'), '', trim($split_search[$i]))))
+ 					{
+ 						$split_search[$i] = '';
+ 						continue;
+ 					}
+ 					
  					switch ( $split_search[$i] )
  					{

Index: mx_forum.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_forum.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mx_forum.php	25 Apr 2005 21:48:36 -0000	1.7
--- mx_forum.php	10 Sep 2005 22:08:24 -0000	1.8
***************
*** 88,91 ****
--- 88,92 ----
  // removing them
  //
+ /*
  $total_posts = get_db_stat('postcount');
  $total_users = get_db_stat('usercount');
***************
*** 119,123 ****
  	$l_total_user_s = $lang['Registered_users_total'];
  }
! 
  
  //
--- 120,124 ----
  	$l_total_user_s = $lang['Registered_users_total'];
  }
! */
  
  //
***************
*** 281,287 ****
  		'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'],
--- 282,291 ----
  		'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
  
! 		//
! 		// Removed stats
! 		//
! 		//'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'],