[mxbb-commits] core/modules/mx_phpbb2blocks mx_poll.php, 1.5, 1.6 mx_announce.php, 1.7, 1.8 mx_forum.php, 1.6, 1.7 mx_last_msg.php, 1.6, 1.7

[MW <jo...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28808/modules/mx_phpbb2blocks

Modified Files:
	mx_poll.php mx_announce.php mx_forum.php mx_last_msg.php 
Log Message:
part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS

Index: mx_poll.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_poll.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mx_poll.php	4 Feb 2008 16:53:19 -0000	1.5
--- mx_poll.php	9 Feb 2008 12:49:53 -0000	1.6
***************
*** 79,85 ****
  	// Vote in a poll
  	//
! 	if ( !empty($HTTP_POST_VARS[$vote_id_name]) )
  	{
! 		$vote_option_id = intval($HTTP_POST_VARS[$vote_id_name]);
  
  		$sql = "SELECT vd.vote_id
--- 79,85 ----
  	// Vote in a poll
  	//
! 	if ( !$mx_request_vars->is_empty_post($vote_id_name))
  	{
! 		$vote_option_id = $mx_request_vars->post($vote_id_name, MX_TYPE_INT);
  
  		$sql = "SELECT vd.vote_id
***************
*** 194,200 ****
  		$db->sql_freeresult($result);
  
! 		if ( ( isset($HTTP_GET_VARS['vote']) || isset($HTTP_POST_VARS['vote']) ) || ( !$userdata['session_logged_in'] ) )
  		{
! 			$view_result = ( ( ( ( isset($HTTP_GET_VARS['vote']) ) ? $HTTP_GET_VARS['vote'] : $HTTP_POST_VARS['vote'] ) == 'viewresult' ) || ( !$userdata['session_logged_in'] ) ) ? TRUE : 0;
  		}
  		else
--- 194,200 ----
  		$db->sql_freeresult($result);
  
! 		if ($mx_request_vars->is_request('vote') || !$userdata['session_logged_in'])
  		{
! 			$view_result = ($mx_request_vars->request('vote') == 'viewresult' || !$userdata['session_logged_in']) ? TRUE : 0;
  		}
  		else

Index: mx_last_msg.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_last_msg.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mx_last_msg.php	4 Feb 2008 16:53:19 -0000	1.6
--- mx_last_msg.php	9 Feb 2008 12:49:53 -0000	1.7
***************
*** 65,69 ****
  }
  
! $msg_start = ( isset( $HTTP_GET_VARS['lmsg_start'] ) ) ? intval( $HTTP_GET_VARS['lmsg_start'] ) : 0;
  $start_prev = ( $msg_start == 0 ) ? 0 : $msg_start - $PostNumber;
  $start_next = $msg_start + $PostNumber;
--- 65,69 ----
  }
  
! $msg_start = $mx_request_vars->get('lmsg_start', MX_TYPE_INT, 0);
  $start_prev = ( $msg_start == 0 ) ? 0 : $msg_start - $PostNumber;
  $start_next = $msg_start + $PostNumber;

Index: mx_announce.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_announce.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mx_announce.php	8 Feb 2008 08:29:20 -0000	1.7
--- mx_announce.php	9 Feb 2008 12:49:53 -0000	1.8
***************
*** 43,53 ****
  // Start initial var setup
  //
! if ( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) )
  {
! 	$forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]);
  }
! else if ( isset($HTTP_GET_VARS['forum']) )
  {
! 	$forum_id = intval($HTTP_GET_VARS['forum']);
  }
  else
--- 43,53 ----
  // Start initial var setup
  //
! if ($mx_request_vars->is_request(POST_FORUM_URL))
  {
! 	$forum_id = $mx_request_vars->request(POST_FORUM_URL, MX_TYPE_INT);
  }
! else if ($mx_request_vars->is_get('forum') )
  {
! 	$forum_id = $mx_request_vars->get('forum', MX_TYPE_INT);
  }
  else
***************
*** 59,69 ****
  // Decide how to order the post display
  //
! if ( !empty($HTTP_POST_VARS['postorder']) || !empty($HTTP_GET_VARS['postorder']) )
  {
! 	$post_order = ( !empty($HTTP_POST_VARS['postorder']) ) ? $HTTP_POST_VARS['postorder'] : $HTTP_GET_VARS['postorder'];
  }
  
  $post_time_order = ( $post_order == 'asc' ) ? 'ASC' : 'DESC';
! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
  
  //
--- 59,69 ----
  // Decide how to order the post display
  //
! if ( !$mx_request_vars->is_empty_request('postorder') )
  {
! 	$post_order = $mx_request_vars->request('postorder');
  }
  
  $post_time_order = ( $post_order == 'asc' ) ? 'ASC' : 'DESC';
! $start = $mx_request_vars->get('start', MX_TYPE_INT, 0);
  
  //

Index: mx_forum.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_forum.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mx_forum.php	4 Feb 2008 16:53:19 -0000	1.6
--- mx_forum.php	9 Feb 2008 12:49:53 -0000	1.7
***************
*** 32,40 ****
  // ================================================================================
  
! $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
--- 32,40 ----
  // ================================================================================
  
! $viewcat = $mx_request_vars->get(POST_CAT_URL, MX_TYPE_INT, -1);
  
! if ($mx_request_vars->is_request('mark'))
  {
! 	$mark_read = $mx_request_vars->request('mark', MX_TYPE_NO_TAGS);
  }
  else