[mxbb-commits] core/includes mx_functions_blockcp.php, 1.18.2.2, 1.18.2.3

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

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

Modified Files:
      Tag: core28x
	mx_functions_blockcp.php 
Log Message:
Little security update for blockCP, and e tpl bugfix

Index: mx_functions_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -C2 -d -r1.18.2.2 -r1.18.2.3
*** mx_functions_blockcp.php	10 Feb 2008 21:17:54 -0000	1.18.2.2
--- mx_functions_blockcp.php	22 Feb 2008 23:40:48 -0000	1.18.2.3
***************
*** 361,365 ****
  		// Activate BlockCP SubPanels, based on auth
  		//
! 		if (!$new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_general', array(
--- 361,365 ----
  		// Activate BlockCP SubPanels, based on auth
  		//
! 		if (($this->auth_mod || $is_admin) && !$new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_general', array(
***************
*** 368,374 ****
  				'S_SUBMIT' => $buttonvalue
  			));
  		}
  
! 		if ( ($this->auth_mod || $is_admin ) || $new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_general_adds', array(
--- 368,379 ----
  				'S_SUBMIT' => $buttonvalue
  			));
+ 
+ 			//
+ 			// Some general blockcp settings are moderator only
+ 			//
+ 			$blockcptemplate->assign_block_vars('blockcp_general.is_mod', array());
  		}
  
! 		if ( ($is_admin ) || $new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_general_adds', array(
***************
*** 530,534 ****
  		}
  
! 		if ( $is_admin && !$new_block)
  		{
  			$blockcptemplate->assign_block_vars('blockcp_delete', array(
--- 535,539 ----
  		}
  
! 		if ( $is_admin && !$new_block && $this->blockcp_mode != 'mx_blockcp') // Do not allow deleting blocks in blockcp mode
  		{
  			$blockcptemplate->assign_block_vars('blockcp_delete', array(