[mxbb-commits] core/admin index.php, 1.40, 1.41 admin_mx_block_cp.php, 1.18, 1.19 admin_mx_portal.php, 1.38, 1.39 pagestart.php, 1.29, 1.30 index_new.php, 1.7, 1.8 admin_mx_styles.php, 1.2, 1.3 admin_mx_words.php, 1.1, 1.2 admin_mx_chkobjs.php, 1.25, 1.26 admin_mx_preview.php, 1.2, 1.3 admin_mx_module.php, 1.48, 1.49 admin_mx_smilies.php, 1.2, 1.3 admin_mx_module_cp.php, 1.20, 1.21

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

Update of /cvsroot/mxbb/core/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26721/admin

Modified Files:
	index.php admin_mx_block_cp.php admin_mx_portal.php 
	pagestart.php index_new.php admin_mx_styles.php 
	admin_mx_words.php admin_mx_chkobjs.php admin_mx_preview.php 
	admin_mx_module.php admin_mx_smilies.php 
	admin_mx_module_cp.php 
Log Message:
part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS

Index: admin_mx_chkobjs.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** admin_mx_chkobjs.php	5 Feb 2008 14:51:27 -0000	1.25
--- admin_mx_chkobjs.php	9 Feb 2008 12:44:32 -0000	1.26
***************
*** 91,106 ****
  // Check to see if we need to show the table selection box.
  //
! if( isset($HTTP_POST_VARS['check_mode']) || isset($HTTP_GET_VARS['check_mode']) )
  {
! 	$check_mode = ( isset($HTTP_POST_VARS['check_mode']) ? $HTTP_POST_VARS['check_mode'] : $HTTP_GET_VARS['check_mode'] );
  }
  else
  {
! 	if( !isset($HTTP_GET_VARS['mode']) )
  	{
  		$select_options = '<select name="check_mode">';
  		for( $i=0; $i < count($check_args); $i++ )
  		{
! 			$selected = ( $i == $HTTP_GET_VARS['table'] ? ' selected="selected"' : '' );
  			$select_options .= '<option value="'.$i.'"'.$selected.'>'.$check_args[$i]['table'].'</option>';
  		}
--- 91,106 ----
  // Check to see if we need to show the table selection box.
  //
! if ($mx_request_vars->is_request('check_mode'))
  {
! 	$check_mode = $mx_request_vars->request('check_mode');
  }
  else
  {
! 	if (!$mx_request_vars->is_get('mode'))
  	{
  		$select_options = '<select name="check_mode">';
  		for( $i=0; $i < count($check_args); $i++ )
  		{
! 			$selected = ( $i == $mx_request_vars->get('table', MX_TYPE_INT) ? ' selected="selected"' : '' );
  			$select_options .= '<option value="'.$i.'"'.$selected.'>'.$check_args[$i]['table'].'</option>';
  		}
***************
*** 115,123 ****
  	}
  
! 	$mode  = $HTTP_GET_VARS['mode'];
! 	$tb    = $HTTP_GET_VARS['table'];
  	$table = $check_args[$tb]['table'];
! 	$val0  = $HTTP_GET_VARS['val0'];
! 	$val1  = $HTTP_GET_VARS['val1'];
  	$tab0  = $check_args[$tb]['fkeys'][0][0];
  	$key0  = $check_args[$tb]['fkeys'][0][1];
--- 115,123 ----
  	}
  
! 	$mode  = $mx_request_vars->get('mode', MX_TYPE_NO_TAGS);
! 	$tb    = $mx_request_vars->get('table', MX_TYPE_INT);
  	$table = $check_args[$tb]['table'];
! 	$val0  = $mx_request_vars->get('val0', MX_TYPE_NO_TAGS);
! 	$val1  = $mx_request_vars->get('val1', MX_TYPE_NO_TAGS);
  	$tab0  = $check_args[$tb]['fkeys'][0][0];
  	$key0  = $check_args[$tb]['fkeys'][0][1];

Index: admin_mx_module_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** admin_mx_module_cp.php	4 Feb 2008 15:44:45 -0000	1.20
--- admin_mx_module_cp.php	9 Feb 2008 12:44:32 -0000	1.21
***************
*** 12,17 ****
  if( !empty($setmodules) )
  {
! 	$file = basename(__FILE__);
! 	$module['2_CP']['2_2_ModuleCP'] = 'admin/' . $file;
  	return;
  }
--- 12,16 ----
  if( !empty($setmodules) )
  {
! 	$module['2_CP']['2_2_ModuleCP'] = 'admin/' . basename(__FILE__);
  	return;
  }
***************
*** 84,90 ****
  $sort_cookie = !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) ? explode(",", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) : array();
  
! if ( isset( $HTTP_POST_VARS['include_block_quickedit'] ) )
  {
! 	switch ( $HTTP_POST_VARS['include_block_quickedit'] )
  	{
  		case '0':
--- 83,89 ----
  $sort_cookie = !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) ? explode(",", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) : array();
  
! if ($mx_request_vars->is_post('include_block_quickedit'))
  {
! 	switch ($mx_request_vars->post('include_block_quickedit', MX_TYPE_NO_TAGS))
  	{
  		case '0':
***************
*** 103,109 ****
  }
  
! if ( isset( $HTTP_POST_VARS['include_block_private'] ) )
  {
! 	switch ( $HTTP_POST_VARS['include_block_private'] )
  	{
  		case '0':
--- 102,108 ----
  }
  
! if ($mx_request_vars->is_post('include_block_private'))
  {
! 	switch ($mx_request_vars->post('include_block_private', MX_TYPE_NO_TAGS) )
  	{
  		case '0':
***************
*** 123,129 ****
  
  /*
! if ( isset( $HTTP_POST_VARS['include_all'] ) )
  {
! 	switch ( $HTTP_POST_VARS['include_all'] )
  	{
  		case '0':
--- 122,128 ----
  
  /*
! if ($mx_request_vars->is_post('include_all'))
  {
! 	switch ( $mx_request_vars->post('include_all', MX_TYPE_NO_TAGS))
  	{
  		case '0':

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** index.php	5 Feb 2008 14:51:27 -0000	1.40
--- index.php	9 Feb 2008 12:44:32 -0000	1.41
***************
*** 22,25 ****
--- 22,26 ----
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
  $no_page_header = TRUE;
+ 
  require('./pagestart.' . $phpEx);
  
***************
*** 86,90 ****
  // Generate relevant output
  //
! if( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' )
  {
  	include('./page_header_admin.'.$phpEx);
--- 87,91 ----
  // Generate relevant output
  //
! if ($mx_request_vars->is_get('pane') && $mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' )
  {
  	include('./page_header_admin.'.$phpEx);
***************
*** 93,99 ****
  		'body' => 'admin/index_navigate.tpl')
  	);
! 
  	$admincp_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons'];
! 
  	$template->assign_vars(array(
  		'U_PHPBB_ROOT_PATH' => PHPBB_URL,
--- 94,100 ----
  		'body' => 'admin/index_navigate.tpl')
  	);
! 	
  	$admincp_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons'];
! 	
  	$template->assign_vars(array(
  		'U_PHPBB_ROOT_PATH' => PHPBB_URL,
***************
*** 117,125 ****
  		"L_PREVIEW_FORUM" => $lang['Preview_forum'])
  	);
! 
  	//
  	// Read Portal configuration
  	//
- 
  	// MX Addon ------------------------------------
  	$module_portal = read_admin('.');
--- 118,125 ----
  		"L_PREVIEW_FORUM" => $lang['Preview_forum'])
  	);
! 	
  	//
  	// Read Portal configuration
  	//
  	// MX Addon ------------------------------------
  	$module_portal = read_admin('.');
***************
*** 128,132 ****
  	));
  	// END ------------------------------------------
! 
  	ksort($module_portal);
  
--- 128,132 ----
  	));
  	// END ------------------------------------------
! 	
  	ksort($module_portal);
  
***************
*** 356,360 ****
  	include('./page_footer_admin.'.$phpEx);
  }
! elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
  {
  
--- 356,360 ----
  	include('./page_footer_admin.'.$phpEx);
  }
! elseif ($mx_request_vars->is_get('pane') && $mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'right' )
  {
  

Index: admin_mx_preview.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_preview.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_mx_preview.php	4 Feb 2008 15:44:45 -0000	1.2
--- admin_mx_preview.php	9 Feb 2008 12:44:32 -0000	1.3
***************
*** 31,38 ****
  // Set mode
  //
! if( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) )
  {
! 	$mode = ( isset( $HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
! 	$mode = htmlspecialchars($mode);
  }
  else
--- 31,37 ----
  // Set mode
  //
! if ($mx_request_vars->is_request('mode'))
  {
! 	$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS);
  }
  else

Index: admin_mx_smilies.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_mx_smilies.php	13 Sep 2007 09:42:18 -0000	1.2
--- admin_mx_smilies.php	9 Feb 2008 12:44:32 -0000	1.3
***************
*** 40,46 ****
  // Load default header
  //
! if( isset($HTTP_GET_VARS['export_pack']) )
  {
! 	if ( $HTTP_GET_VARS['export_pack'] == "send" )
  	{
  		$no_page_header = true;
--- 40,46 ----
  // Load default header
  //
! if ($mx_request_vars->is_get('export_pack'))
  {
! 	if ($mx_request_vars->get('export_pack', MX_TYPE_NO_TAGS) == "send" )
  	{
  		$no_page_header = true;
***************
*** 52,56 ****
  require($mx_root_path . 'extension.inc');
  
! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
  $no_page_header = $cancel;
  
--- 52,56 ----
  require($mx_root_path . 'extension.inc');
  
! $cancel = $mx_request_vars->is_post('cancel');
  $no_page_header = $cancel;
  
***************
*** 64,68 ****
  $mx_root_path = './../';
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
  $no_page_header = $cancel;
  require('./pagestart.' . $phpEx);
--- 64,68 ----
  $mx_root_path = './../';
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
! $cancel = $mx_request_vars->is_post('cancel');
  $no_page_header = $cancel;
  require('./pagestart.' . $phpEx);
***************
*** 81,87 ****
  // Check to see what mode we should operate in.
  //
! if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
  {
! 	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
  	$mode = htmlspecialchars($mode);
  }
--- 81,87 ----
  // Check to see what mode we should operate in.
  //
! if ($mx_request_vars->is_request('mode'))
  {
! 	$mode = $mx_request_vars->request('mode',MX_TYPE_NO_TAGS);
  	$mode = htmlspecialchars($mode);
  }
***************
*** 120,131 ****
  // Select main mode
  //
! if( isset($HTTP_GET_VARS['import_pack']) || isset($HTTP_POST_VARS['import_pack']) )
  {
  	//
  	// Import a list a "Smiley Pack"
  	//
! 	$smile_pak = ( isset($HTTP_POST_VARS['smile_pak']) ) ? $HTTP_POST_VARS['smile_pak'] : $HTTP_GET_VARS['smile_pak'];
! 	$clear_current = ( isset($HTTP_POST_VARS['clear_current']) ) ? $HTTP_POST_VARS['clear_current'] : $HTTP_GET_VARS['clear_current'];
! 	$replace_existing = ( isset($HTTP_POST_VARS['replace']) ) ? $HTTP_POST_VARS['replace'] : $HTTP_GET_VARS['replace'];
  
  	if ( !empty($smile_pak) )
--- 120,131 ----
  // Select main mode
  //
! if ($mx_request_vars->is_request('import_pack'))
  {
  	//
  	// Import a list a "Smiley Pack"
  	//
! 	$smile_pak = $mx_request_vars->request('smile_pak', MX_TYPE_NO_TAGS);
! 	$clear_current = $mx_request_vars->request('clear_current', MX_TYPE_NO_TAGS);
! 	$replace_existing = $mx_request_vars->request('replace', MX_TYPE_NO_TAGS);
  
  	if ( !empty($smile_pak) )
***************
*** 256,265 ****
  	}
  }
! else if( isset($HTTP_POST_VARS['export_pack']) || isset($HTTP_GET_VARS['export_pack']) )
  {
  	//
  	// Export our smiley config as a smiley pak...
  	//
! 	if ( $HTTP_GET_VARS['export_pack'] == "send" )
  	{
  		$sql = "SELECT *
--- 256,265 ----
  	}
  }
! else if ($mx_request_vars->is_request('export_pack'))
  {
  	//
  	// Export our smiley config as a smiley pak...
  	//
! 	if ($mx_request_vars->get('export_pack', MX_TYPE_NO_TAGS) == "send" )
  	{
  		$sql = "SELECT *
***************
*** 293,297 ****
  
  }
! else if( isset($HTTP_POST_VARS['add']) || isset($HTTP_GET_VARS['add']) )
  {
  	//
--- 293,297 ----
  
  }
! else if ($mx_request_vars->is_request('add'))
  {
  	//
***************
*** 340,349 ****
  			//
  
! 			$smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
! 			$smiley_id = intval($smiley_id);
! 
! 			$confirm = isset($HTTP_POST_VARS['confirm']);
  
! 			if( $confirm )
  			{
  				$sql = "DELETE FROM " . SMILIES_TABLE . "
--- 340,346 ----
  			//
  
! 			$smiley_id = $mx_request_vars->request('id', MX_TYPE_INT);
  
! 			if ($mx_request_vars->is_post('confirm'))
  			{
  				$sql = "DELETE FROM " . SMILIES_TABLE . "
***************
*** 387,392 ****
  			//
  
! 			$smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
! 			$smiley_id = intval($smiley_id);
  
  			$sql = "SELECT *
--- 384,388 ----
  			//
  
! 			$smiley_id = $mx_request_vars->request('id', MX_TYPE_INT);
  
  			$sql = "SELECT *
***************
*** 455,463 ****
  			// accept the data we are looking for.
  			//
! 			$smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? trim($HTTP_POST_VARS['smile_code']) : '';
! 			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? trim($HTTP_POST_VARS['smile_url']) : '';
  			$smile_url = phpBB2::phpbb_ltrim(basename($smile_url), "'");
! 			$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? htmlspecialchars(trim($HTTP_POST_VARS['smile_emotion'])) : '';
! 			$smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : 0;
  			$smile_code = trim($smile_code);
  			$smile_url = trim($smile_url);
--- 451,459 ----
  			// accept the data we are looking for.
  			//
! 			$smile_code = $mx_request_vars->post('smile_code');
! 			$smile_url = $mx_request_vars->post('smile_url', MX_TYPE_NO_TAGS);
  			$smile_url = phpBB2::phpbb_ltrim(basename($smile_url), "'");
! 			$smile_emotion = $mx_request_vars->post('smile_emotion', MX_TYPE_NO_HTML);
! 			$smile_id = $mx_request_vars->post('smile_id', MX_TYPE_INT, 0);
  			$smile_code = trim($smile_code);
  			$smile_url = trim($smile_url);
***************
*** 500,507 ****
  			// we recieve and process is only the data we are looking for.
  			//
! 			$smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : '';
! 			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : '';
  			$smile_url = phpBB2::phpbb_ltrim(basename($smile_url), "'");
! 			$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? htmlspecialchars(trim($HTTP_POST_VARS['smile_emotion'])) : '';
  			$smile_code = trim($smile_code);
  			$smile_url = trim($smile_url);
--- 496,503 ----
  			// we recieve and process is only the data we are looking for.
  			//
! 			$smile_code = $mx_request_vars->post('smile_code');
! 			$smile_url = $mx_request_vars->post('smile_url');
  			$smile_url = phpBB2::phpbb_ltrim(basename($smile_url), "'");
! 			$smile_emotion = $mx_request_vars->post('smile_emotion', MX_TYPE_NO_HTML);
  			$smile_code = trim($smile_code);
  			$smile_url = trim($smile_url);

Index: admin_mx_module.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** admin_mx_module.php	4 Feb 2008 15:44:45 -0000	1.48
--- admin_mx_module.php	9 Feb 2008 12:44:32 -0000	1.49
***************
*** 12,17 ****
  if( !empty($setmodules) )
  {
! 	$file = basename(__FILE__);
! 	$module['2_CP']['2_1_Modules'] = 'admin/' . $file;
  	return;
  }
--- 12,16 ----
  if( !empty($setmodules) )
  {
! 	$module['2_CP']['2_1_Modules'] = 'admin/' . basename(__FILE__);
  	return;
  }

Index: index_new.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index_new.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index_new.php	8 Feb 2008 14:53:45 -0000	1.7
--- index_new.php	9 Feb 2008 12:44:32 -0000	1.8
***************
*** 91,99 ****
  if ( ( empty( $_SID ) || $_SID == 'sid=' ) )
  {
! 	$_SID = 'sid=' . $HTTP_GET_VARS['sid'];
  }
  if ( ( empty( $SID ) || $SID == 'sid=' ) )
  {
! 	$SID = 'sid=' . $HTTP_GET_VARS['sid'];
  }
  
--- 91,99 ----
  if ( ( empty( $_SID ) || $_SID == 'sid=' ) )
  {
! 	$_SID = 'sid='.$mx_request_vars->get('sid', MX_TYPE_NO_TAGS);
  }
  if ( ( empty( $SID ) || $SID == 'sid=' ) )
  {
! 	$SID = 'sid='.$mx_request_vars->get('sid', MX_TYPE_NO_TAGS);
  }
  

Index: admin_mx_words.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_words.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_mx_words.php	13 Sep 2007 09:12:37 -0000	1.1
--- admin_mx_words.php	9 Feb 2008 12:44:32 -0000	1.2
***************
*** 49,56 ****
  }
  
! if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
! 	$mode = (isset($HTTP_GET_VARS['mode'])) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
! 	$mode = htmlspecialchars($mode);
  }
  else
--- 49,55 ----
  }
  
! if ($mx_request_vars->is_request('mode'))
  {
! 	$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS);
  }
  else
***************
*** 59,73 ****
  	// These could be entered via a form button
  	//
! 	if( isset($HTTP_POST_VARS['add']) )
  	{
! 		$mode = "add";
  	}
! 	else if( isset($HTTP_POST_VARS['save']) )
  	{
! 		$mode = "save";
  	}
  	else
  	{
! 		$mode = "";
  	}
  }
--- 58,72 ----
  	// These could be entered via a form button
  	//
! 	if ($mx_request_vars->is_post('add'))
  	{
! 		$mode = 'add';
  	}
! 	else if ($mx_request_vars->is_post('save'))
  	{
! 		$mode = 'save';
  	}
  	else
  	{
! 		$mode = '';
  	}
  }
***************
*** 80,84 ****
  	if( $mode == "edit" || $mode == "add" )
  	{
! 		$word_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0;
  
  		$template->set_filenames(array(
--- 79,83 ----
  	if( $mode == "edit" || $mode == "add" )
  	{
! 		$word_id = $mx_request_vars->get('id', MX_TYPE_INT, 0);
  
  		$template->set_filenames(array(
***************
*** 131,137 ****
  	else if( $mode == "save" )
  	{
! 		$word_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0;
! 		$word = ( isset($HTTP_POST_VARS['word']) ) ? trim($HTTP_POST_VARS['word']) : "";
! 		$replacement = ( isset($HTTP_POST_VARS['replacement']) ) ? trim($HTTP_POST_VARS['replacement']) : "";
  
  		if($word == "" || $replacement == "")
--- 130,136 ----
  	else if( $mode == "save" )
  	{
! 		$word_id = $mx_request_vars->post('id', MX_TYPE_INT, 0);
! 		$word = $mx_request_vars->post('word', MX_TYPE_NO_TAGS);
! 		$replacement = $mx_request_vars->post('replacement', MX_TYPE_NO_TAGS);
  
  		if($word == "" || $replacement == "")
***************
*** 165,172 ****
  	else if( $mode == "delete" )
  	{
! 		if( isset($HTTP_POST_VARS['id']) ||  isset($HTTP_GET_VARS['id']) )
  		{
! 			$word_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
! 			$word_id = intval($word_id);
  		}
  		else
--- 164,170 ----
  	else if( $mode == "delete" )
  	{
! 		if ($mx_request_vars->is_request('id'))
  		{
! 			$word_id = $mx_request_vars->request('id', MX_TYPE_INT);
  		}
  		else
***************
*** 175,179 ****
  		}
  
! 		$confirm = isset($HTTP_POST_VARS['confirm']);
  
  		if( $word_id && $confirm )
--- 173,177 ----
  		}
  
! 		$confirm = $mx_request_vars->is_post('confirm');
  
  		if( $word_id && $confirm )

Index: admin_mx_styles.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_styles.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_mx_styles.php	13 Sep 2007 09:12:37 -0000	1.2
--- admin_mx_styles.php	9 Feb 2008 12:44:32 -0000	1.3
***************
*** 23,32 ****
  if( !empty($setmodules) )
  {
! 	$file = basename(__FILE__);
! 	$module['3_CP']['2_1_new'] = 'admin/' . "$file?mode=addnew";
! 	//$module['Styles']['Create_new'] = 'admin/' . "$file?mode=create";
! 	$module['3_CP']['2_2_manage'] = 'admin/' . $file;
! 	//$module['Styles']['Export'] = 'admin/' . "$file?mode=export";
! 	//$module['2_CP']['2_1_Modules'] = 'admin/' . $file;
  	return;
  }
--- 23,32 ----
  if( !empty($setmodules) )
  {
! 	$filename = basename(__FILE__);
! 	$module['3_CP']['2_1_new'] = 'admin/' . "$filename?mode=addnew";
! 	//$module['Styles']['Create_new'] = 'admin/' . "$filename?mode=create";
! 	$module['3_CP']['2_2_manage'] = 'admin/' . $filename;
! 	//$module['Styles']['Export'] = 'admin/' . "$filename?mode=export";
! 	//$module['2_CP']['2_1_Modules'] = 'admin/' . $filename;
  	return;
  }
***************
*** 46,51 ****
  include_once('./page_header_admin.php');
  
! $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
  
  if ($cancel)
--- 46,51 ----
  include_once('./page_header_admin.php');
  
! $confirm = $mx_request_vars->is_post('confirm');
! $cancel = $mx_request_vars->is_post('cancel');
  
  if ($cancel)
***************
*** 54,65 ****
  }
  
! if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
! 	$mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
! 	$mode = htmlspecialchars($mode);
  }
  else
  {
! 	$mode = "";
  }
  
--- 54,64 ----
  }
  
! if ($mx_request_vars->is_request('mode'))
  {
! 	$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS);
  }
  else
  {
! 	$mode = '';
  }
  
***************
*** 67,72 ****
  {
  	case "addnew":
! 		$install_to = ( isset($HTTP_GET_VARS['install_to']) ) ? urldecode($HTTP_GET_VARS['install_to']) : $HTTP_POST_VARS['install_to'];
! 		$style_name = ( isset($HTTP_GET_VARS['style']) ) ? urldecode($HTTP_GET_VARS['style']) : $HTTP_POST_VARS['style'];
  
  		if( isset($install_to) )
--- 66,71 ----
  {
  	case "addnew":
! 		$install_to = $mx_request_vars->is_get('install_to') ? urldecode($mx_request_vars->get('install_to', MX_TYPE_NO_TAGS)) : $mx_request_vars->post('install_to', MX_TYPE_NO_TAGS);
! 		$style_name = $mx_request_vars->is_get('style') ? urldecode($mx_request_vars->get('style', MX_TYPE_NO_TAGS)) : $mx_request_vars->post('style', MX_TYPE_NO_TAGS);
  
  		if( isset($install_to) )
***************
*** 162,166 ****
  
  	case "delete":
! 		$style_id = ( isset($HTTP_GET_VARS['style_id']) ) ? intval($HTTP_GET_VARS['style_id']) : intval($HTTP_POST_VARS['style_id']);
  
  		if( !$confirm )
--- 161,165 ----
  
  	case "delete":
! 		$style_id = $mx_request_vars->request('style_id', MX_TYPE_INT);
  
  		if( !$confirm )
***************
*** 263,267 ****
  }
  
! if (empty($HTTP_POST_VARS['send_file']))
  {
  	include('./page_footer_admin.php');
--- 262,266 ----
  }
  
! if ($mx_request_vars->is_empty_post('send_file'))
  {
  	include('./page_footer_admin.php');

Index: pagestart.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** pagestart.php	4 Feb 2008 15:44:44 -0000	1.29
--- pagestart.php	9 Feb 2008 12:44:32 -0000	1.30
***************
*** 56,60 ****
  }
  
! if( $HTTP_GET_VARS['sid'] != $userdata['session_id'] )
  {
  	$url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $HTTP_SERVER_VARS['REQUEST_URI']);
--- 56,60 ----
  }
  
! if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $userdata['session_id'] )
  {
  	$url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $HTTP_SERVER_VARS['REQUEST_URI']);

Index: admin_mx_portal.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** admin_mx_portal.php	4 Feb 2008 15:44:45 -0000	1.38
--- admin_mx_portal.php	9 Feb 2008 12:44:32 -0000	1.39
***************
*** 29,33 ****
  $mode = '';
  
! if( isset($HTTP_POST_VARS['submit']) )
  {
  	$mode = 'submit';
--- 29,33 ----
  $mode = '';
  
! if ($mx_request_vars->is_post('submit') )
  {
  	$mode = 'submit';

Index: admin_mx_block_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** admin_mx_block_cp.php	4 Feb 2008 15:44:45 -0000	1.18
--- admin_mx_block_cp.php	9 Feb 2008 12:44:32 -0000	1.19
***************
*** 67,74 ****
  // Parameters
  //
! $submit = ( isset($HTTP_POST_VARS['submit']) ) ? true : false;
! $submit_pars = ( isset($HTTP_POST_VARS['submit_pars']) ) ? true : false;
! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
! $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false;
  $refresh = $preview || $submit_search;
  
--- 67,74 ----
  // Parameters
  //
! $submit = $mx_request_vars->is_post('submit');
! $submit_pars = $mx_request_vars->is_post('submit_pars');
! $cancel = $mx_request_vars->is_post('cancel');
! $preview = $mx_request_vars->is_post('preview');
  $refresh = $preview || $submit_search;