[mxbb-commits] core/admin admin_mx_page.php,1.20,1.21

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

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

Modified Files:
	admin_mx_page.php 
Log Message:
Replaced use of HTTP_POST_VARS/HTTP_GET_VARS with new mx_request_vars class.

Index: admin_mx_page.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_page.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** admin_mx_page.php	3 Apr 2005 13:34:50 -0000	1.20
--- admin_mx_page.php	3 Apr 2005 15:12:50 -0000	1.21
***************
*** 117,121 ****
  function page_edit($mode, $page_id)
  {
! 	global $template, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $phpEx;
  
  	$auth_fields = array('auth_view');
--- 117,121 ----
  function page_edit($mode, $page_id)
  {
! 	global $template, $lang, $db, $board_config, $theme, $mx_request_vars, $phpEx;
  
  	$auth_fields = array('auth_view');
***************
*** 151,156 ****
  		$newmode = 'create';
  		$buttonvalue = $lang['Submit'];
! 		$page_name = $HTTP_POST_VARS['page_name'];
! 		$page_desc = $HTTP_POST_VARS['page_desc']; 
  		// $page_icon = empty($row['page_icon']) ? 'icon_home.gif' : $row['page_icon'];
  		$page_icon = post_icons('page_icons/');
--- 151,156 ----
  		$newmode = 'create';
  		$buttonvalue = $lang['Submit'];
! 		$page_name = $mx_request_vars->post('page_name', MX_TYPE_ANY, '');
! 		$page_desc = $mx_request_vars->post('page_desc', MX_TYPE_ANY, '');
  		// $page_icon = empty($row['page_icon']) ? 'icon_home.gif' : $row['page_icon'];
  		$page_icon = post_icons('page_icons/');
***************
*** 248,259 ****
  function page_modify($mode, $page_id)
  {
! 	global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS, $phpEx;
  
  	if ( $mode == 'modify' )
  	{
! 		if ( $page_id != intval($HTTP_POST_VARS['page_id_new']) )
  		{
  			$sql = "UPDATE " . COLUMN_TABLE . "
!         		SET page_id = " . intval($HTTP_POST_VARS['page_id_new']) . "
          		WHERE page_id = " . $page_id;
  			if ( !( $result = $db->sql_query($sql) ) )
--- 248,267 ----
  function page_modify($mode, $page_id)
  {
! 	global $template, $lang, $db, $board_config, $theme, $mx_request_vars, $phpEx;
! 
! 	$page_id_new = $mx_request_vars->post('page_id_new', MX_TYPE_INT, 0);
! 	$page_name = $mx_request_vars->post('page_name', MX_TYPE_ANY, '');
! 	$page_desc = $mx_request_vars->post('page_desc', MX_TYPE_ANY, '');
! 	$page_icon = $mx_request_vars->post('menuicon', MX_TYPE_NO_TAGS, '');
! 	$page_header = $mx_request_vars->post('page_header', MX_TYPE_NO_TAGS, '');
! 	$page_graph_border = $mx_request_vars->post('page_graph_border', MX_TYPE_NO_TAGS, '');
! 	$auth_view = $mx_request_vars->post('auth_view', MX_TYPE_INT, 0);
  
  	if ( $mode == 'modify' )
  	{
! 		if ( $page_id != $page_id_new )
  		{
  			$sql = "UPDATE " . COLUMN_TABLE . "
!         		SET page_id = " . $page_id_new . "
          		WHERE page_id = " . $page_id;
  			if ( !( $result = $db->sql_query($sql) ) )
***************
*** 263,274 ****
  		}
  		$sql = "UPDATE " . PAGE_TABLE . "
! 	      SET page_id           = " . intval($HTTP_POST_VARS['page_id_new']) . ",
! 	          page_name         = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_name']) . "',
! 	          page_desc         = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_desc']) . "',
! 	    	  page_icon         = '" . str_replace("\'", "''", $HTTP_POST_VARS['menuicons']) . "',
! 	          page_header       = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_header']) . "',
! 	          page_graph_border = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_graph_border']) . "',
! 	          auth_view = '" . $HTTP_POST_VARS['auth_view'] . "'
! 	      WHERE page_id = " . $page_id;
  		if ( !( $result = $db->sql_query($sql) ) )
  		{
--- 271,282 ----
  		}
  		$sql = "UPDATE " . PAGE_TABLE . "
! 	      SET page_id           = '$page_id_new',
! 	          page_name         = '$page_name',
! 	          page_desc         = '$page_desc',
! 	    	  page_icon         = '$page_icon',
! 	          page_header       = '$page_header',
! 	          page_graph_border = '$page_graph_border',
! 	          auth_view         = '$auth_view'
! 	      WHERE page_id = $page_id";
  		if ( !( $result = $db->sql_query($sql) ) )
  		{
***************
*** 276,284 ****
  		}
  	}
! 
! 	if ( $mode == 'create' )
  	{
  		$sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_graph_border, auth_view, page_header )
! 			VALUES ( '$HTTP_POST_VARS[page_id_new]' , '$HTTP_POST_VARS[page_name]', '$HTTP_POST_VARS[page_desc]', '$HTTP_POST_VARS[menuicons]',  '$HTTP_POST_VARS[page_graph_border]', '$HTTP_POST_VARS[auth_view]', '$HTTP_POST_VARS[page_header]' )";
  		if ( !( $result = $db->sql_query($sql) ) )
  		{
--- 284,291 ----
  		}
  	}
! 	elseif ( $mode == 'create' )
  	{
  		$sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_graph_border, auth_view, page_header )
! 			VALUES ( '$page_id_new' , '$page_name', '$page_desc', '$page_icon',  '$page_graph_border', '$auth_view', '$page_header' )";
  		if ( !( $result = $db->sql_query($sql) ) )
  		{
***************
*** 287,301 ****
  
  		// Page templates
- 		
- 		if ( isset($HTTP_POST_VARS['use_template']) || isset($HTTP_GET_VARS['use_template']) )
- 		{
- 			$use_template = ( isset($HTTP_POST_VARS['use_template']) ) ? $HTTP_POST_VARS['use_template'] : $HTTP_GET_VARS['use_template'];
- 		}
- 		else
- 		{
- 			$use_template = '';
- 		}
  
! 		if ( $use_template != '' && $use_template != '1' )
  		{
  			$sql = " SELECT * FROM " . COLUMN_TEMPLATES . " WHERE page_template_id = " . $use_template;
--- 294,301 ----
  
  		// Page templates
  
! 		$use_template = $mx_request_vars->post('use_template', MX_TYPE_INT, 0);
! 
! 		if ( $use_template > 1 )
  		{
  			$sql = " SELECT * FROM " . COLUMN_TEMPLATES . " WHERE page_template_id = " . $use_template;
***************
*** 309,313 ****
  			for( $row_count = 0; $row_count < count($row); $row_count++ )
  			{
! 				$sql1 = "INSERT INTO " . COLUMN_TABLE . " (column_title, column_order, column_size, page_id) VALUES ( '" . $row[$row_count]['column_title'] . "', '" . $row[$row_count]['column_order'] . "', '" . $row[$row_count]['column_size'] . "', '" . $HTTP_POST_VARS['page_id_new'] . "' )";
  				if ( !( $result = $db->sql_query($sql1) ) )
  				{
--- 309,314 ----
  			for( $row_count = 0; $row_count < count($row); $row_count++ )
  			{
! 				$sql1 = "INSERT INTO " . COLUMN_TABLE . " (column_title, column_order, column_size, page_id)
! 					VALUES ( '" . $row[$row_count]['column_title'] . "', '" . $row[$row_count]['column_order'] . "', '" . $row[$row_count]['column_size'] . "', '$page_id_new' )";
  				if ( !( $result = $db->sql_query($sql1) ) )
  				{
***************
*** 335,339 ****
  function page_delete($mode, $page_id)
  {
! 	global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS, $phpEx;
  
  	if ( $mode == 'delete' )
--- 336,340 ----
  function page_delete($mode, $page_id)
  {
! 	global $template, $lang, $db, $board_config, $theme, $phpEx;
  
  	if ( $mode == 'delete' )