[mxbb-commits] core/modules/mx_coreblocks mx_blockcp.php, 1.13, 1.14

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

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

Modified Files:
	mx_blockcp.php 
Log Message:
a couple of issues with the blockCP

Index: mx_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mx_blockcp.php	22 Aug 2006 20:21:50 -0000	1.13
--- mx_blockcp.php	24 Aug 2006 21:12:52 -0000	1.14
***************
*** 74,82 ****
  // Initial vars
  //
! $block_id = $mx_request_vars->request('block_id', MX_TYPE_INT, '');
  $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, '');
  $sub_id = $mx_request_vars->request('sub_id', MX_TYPE_INT, 0);
  $blog_u = $mx_request_vars->request('u', MX_TYPE_INT, $userdata['user_id']);
  
  //
  // Parameters
--- 74,84 ----
  // Initial vars
  //
! $block_id = $mx_request_vars->is_request('block_id') ? $mx_request_vars->request('block_id', MX_TYPE_INT, '') : $mx_request_vars->request('id', MX_TYPE_INT, '');
  $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, '');
  $sub_id = $mx_request_vars->request('sub_id', MX_TYPE_INT, 0);
  $blog_u = $mx_request_vars->request('u', MX_TYPE_INT, $userdata['user_id']);
  
+ $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
+ 
  //
  // Parameters
***************
*** 131,135 ****
  // Auth
  //
! if ( !($mx_blockcp->auth_edit || $mx_blockcp->auth_mod) || $sid != $userdata['session_id'])
  {
  	die('You are not authorized to edit this block :(');
--- 133,137 ----
  // Auth
  //
! if ( !($mx_blockcp->auth_edit || $mx_blockcp->auth_mod || $is_admin) || $sid != $userdata['session_id'] )
  {
  	die('You are not authorized to edit this block :(');
***************
*** 144,148 ****
  	// Get vars
  	//
- 	$id = $mx_request_vars->request('id', MX_TYPE_INT, '');
  	$dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, '');
  
--- 146,149 ----
***************
*** 155,159 ****
  		// Send to adminCP
  		//
! 		$result_message = $mx_admin->do_it($mode, $action, $id);
  
  		//
--- 156,160 ----
  		// Send to adminCP
  		//
! 		$result_message = $mx_admin->do_it($mode, $action, $block_id);
  
  		//
***************
*** 177,181 ****
  		// Send to BlockCP
  		//
! 		$result_message = $mx_blockcp->submit_parameters($id);
  	}
  
--- 178,182 ----
  		// Send to BlockCP
  		//
! 		$result_message = $mx_blockcp->submit_parameters($block_id);
  	}