[mxbb-commits] core/admin admin_mx_block_cp.php,1.12,1.13

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

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

Modified Files:
	admin_mx_block_cp.php 
Log Message:
handy switch in common.php when upgrading sites
several major fixes for the blockCP - adding blocks for functions with no blocks etc
navigation menu adminCP rewritten. query data. no cache.
subsilver narrow layout
a couple of fixes when basedir restriction is activated

Index: admin_mx_block_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** admin_mx_block_cp.php	27 Jun 2006 07:52:02 -0000	1.12
--- admin_mx_block_cp.php	22 Aug 2006 20:21:49 -0000	1.13
***************
*** 79,94 ****
  }
  
! if ( empty($block_id) )
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id';
  	$block_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 1;
  }
! 
! setcookie($board_config['cookie_name'] . '_adminBlockCP_block_id', $block_id, time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
  
  //
  // Init the User BlockCP
  //
! $mx_blockcp->init($block_id, true);
  
  //
--- 79,106 ----
  }
  
! //
! // Intitialize with cookie stored block id
! //
! if ( empty($block_id) && !$mx_request_vars->is_request('function_id') )
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id';
  	$block_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 1;
  }
! else if ( empty($block_id) && $mx_request_vars->is_request('function_id') )
! {
! 	$block_id = 'noBlock'; // blockCP, functions with no blocks
! }
! else
! {
! 	setcookie($board_config['cookie_name'] . '_adminBlockCP_block_id', $block_id, time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! }
  
  //
  // Init the User BlockCP
  //
! if (is_numeric($block_id))
! {
! 	$mx_blockcp->init($block_id, true);
! }
  
  //
***************
*** 178,182 ****
  //
  $mx_dynamic_select = new mx_dynamic_select();
! $mx_dynamic_select->generate($block_id);
  
  //
--- 190,194 ----
  //
  $mx_dynamic_select = new mx_dynamic_select();
! $mx_dynamic_select->generate($block_id, true);
  
  //
***************
*** 215,219 ****
  
  $mx_blockcp->blockcp_mode = 'admin_mx_block_cp';
! $mx_blockcp->generate_cp($block_id, $new_block);
  
  include_once($mx_root_path . 'admin/page_header_admin.' . $phpEx);
--- 227,231 ----
  
  $mx_blockcp->blockcp_mode = 'admin_mx_block_cp';
! $mx_blockcp->generate_cp($block_id);
  
  include_once($mx_root_path . 'admin/page_header_admin.' . $phpEx);