[mxbb-commits] core/admin admin_mx_block.php,1.22,1.23 admin_mx_menu.php,1.20,1.21 admin_mx_page.php,1.18,1.19 pagestart.php,1.7,1.8

[<mxb...@li...>]

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

Modified Files:
	admin_mx_block.php admin_mx_menu.php admin_mx_page.php 
	pagestart.php 
Log Message:
added includes/mx_admincp.php for admincp functions only
minor fixes

Index: pagestart.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pagestart.php	1 Feb 2005 20:40:43 -0000	1.7
--- pagestart.php	17 Mar 2005 11:30:34 -0000	1.8
***************
*** 22,26 ****
   * MX Notes:
   *    This file is borrowed from phpBB, with some modifications
!  * 	 Also, the BLOCK_EDIT switch makes this file accessible when editing blocks in portal mode
   */
  
--- 22,26 ----
   * MX Notes:
   *    This file is borrowed from phpBB, with some modifications
!  * 	  Also, the BLOCK_EDIT switch makes this file accessible when editing blocks in portal mode
   */
  
***************
*** 33,37 ****
  
  include_once( $mx_root_path . 'extension.inc' );
! include_once( $mx_root_path . 'common.' . $phpEx ); // HERE
  include_once( $phpbb_root_path . 'includes/functions_admin.' . $phpEx );
  include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx );
--- 33,39 ----
  
  include_once( $mx_root_path . 'extension.inc' );
! include_once( $mx_root_path . 'common.' . $phpEx );
! 
! include_once( $mx_root_path . 'includes/mx_admincp.' . $phpEx );
  include_once( $phpbb_root_path . 'includes/functions_admin.' . $phpEx );
  include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx );
***************
*** 45,49 ****
  
  // Security - used for block_edits
! $block_id = intval( $HTTP_POST_VARS['block_id'] );
  $block_config = read_block_config( $block_id, false );
  
--- 47,52 ----
  
  // Security - used for block_edits
! 
! $block_id = $mx_request_vars->post('block_id', MX_TYPE_INT, '0');
  $block_config = read_block_config( $block_id, false );
  

Index: admin_mx_page.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_page.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** admin_mx_page.php	6 Mar 2005 01:10:13 -0000	1.18
--- admin_mx_page.php	17 Mar 2005 11:30:34 -0000	1.19
***************
*** 50,54 ****
  {
  	$page_id = ( isset( $HTTP_POST_VARS['page_id'] ) ) ? $HTTP_POST_VARS['page_id'] : $HTTP_GET_VARS['page_id'];
! 	$page_id = htmlspecialchars( $page_id );
  }
  else
--- 50,54 ----
  {
  	$page_id = ( isset( $HTTP_POST_VARS['page_id'] ) ) ? $HTTP_POST_VARS['page_id'] : $HTTP_GET_VARS['page_id'];
! 	$page_id = intval( $page_id );
  }
  else

Index: admin_mx_menu.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_menu.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** admin_mx_menu.php	9 Mar 2005 22:46:32 -0000	1.20
--- admin_mx_menu.php	17 Mar 2005 11:30:34 -0000	1.21
***************
*** 1303,1307 ****
  $template->pparse( "admin_menu" );
  
! if ( defined( 'BLOCK_EDIT' ) )
  {
  	include( $mx_root_path . 'includes/page_tail.' . $phpEx );
--- 1303,1307 ----
  $template->pparse( "admin_menu" );
  
! if ( !empty( $portalpage ) )
  {
  	include( $mx_root_path . 'includes/page_tail.' . $phpEx );

Index: admin_mx_block.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_block.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** admin_mx_block.php	6 Mar 2005 01:10:11 -0000	1.22
--- admin_mx_block.php	17 Mar 2005 11:30:34 -0000	1.23
***************
*** 574,578 ****
  function block_setting( $block_id )
  {
! 	global $template, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $portalpage; 
  	
  	// Generate Layout for each block parameter
--- 574,578 ----
  function block_setting( $block_id )
  {
! 	global $template, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $portalpage, $starttime; 
  	
  	// Generate Layout for each block parameter
***************
*** 612,617 ****
  	} 
  	
- 	
- 	
  	$template->set_filenames( array( "edit_block" => "admin/mx_block_setting_body.tpl" ) 
  		);
--- 612,615 ----
***************
*** 771,774 ****
--- 769,773 ----
  		include( './page_header_admin.' . $phpEx );
  	}
+ 	
  	$template->pparse( "edit_block" );