[mxbb-commits] core/includes mx_functions_core.php, 1.50, 1.51 page_header.php, 1.44, 1.45

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

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

Modified Files:
	mx_functions_core.php page_header.php 
Log Message:
Added a few portal main settings for disable site
Added blockCP for navigation block

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** page_header.php	9 Jul 2007 21:57:06 -0000	1.44
--- page_header.php	22 Jul 2007 20:59:56 -0000	1.45
***************
*** 67,71 ****
  	// Initialize template
  	//
- 	//$layouttemplate = new mx_Template( $template->root, $board_config, $db );
  	$layouttemplate = new mx_Template( $mx_root_path . 'templates/'. $theme['template_name'], $board_config, $db );
  }
--- 67,70 ----
***************
*** 80,84 ****
  	// - temp fix to instatiate mx_page for the login page
  	//
- 	$mx_page = new mx_page();
  	$mx_page->init( '1' );
  }
--- 79,82 ----
***************
*** 468,476 ****
  }
  
- define('MX_OVERALL_NAVIGATION', true);
  $block_id = $mx_page->page_navigation_block;
  
  if(!empty($block_id) )
  {
  	$mx_block->init( $block_id );
  
--- 466,475 ----
  }
  
  $block_id = $mx_page->page_navigation_block;
  
  if(!empty($block_id) )
  {
+ 	define('MX_OVERALL_NAVIGATION', true);
+ 
  	$mx_block->init( $block_id );
  
***************
*** 496,499 ****
--- 495,503 ----
  		'OVERALL_NAVIGATION' => $overall_navigation_menu)
  	);
+ 
+ 	if ( ( ( $mx_block->auth_view && $mx_block->auth_edit && $mx_block->show_block ) || $mx_block->auth_mod ) )
+ 	{
+ 		$mx_block->output_cp_button(true);
+ 	}
  }
  

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** mx_functions_core.php	21 Jul 2007 23:07:15 -0000	1.50
--- mx_functions_core.php	22 Jul 2007 20:59:56 -0000	1.51
***************
*** 1458,1462 ****
  	 * @access public
  	 */
! 	function output_cp_button()
  	{
  		global $layouttemplate, $userdata, $mx_root_path, $mx_page, $lang, $block_size, $images;
--- 1458,1462 ----
  	 * @access public
  	 */
! 	function output_cp_button($overall_header = false)
  	{
  		global $layouttemplate, $userdata, $mx_root_path, $mx_page, $lang, $block_size, $images;
***************
*** 1501,1505 ****
  		// Output
  		//
! 		$layouttemplate->assign_block_vars('layout_column.blocks.edit', array(
  			'BLOCK_SIZE'			=> ( !empty( $block_size ) ? $block_size : '100%' ),
  			'EDIT_ACTION'			=> $edit_url,
--- 1501,1505 ----
  		// Output
  		//
! 		$temp_array = array(
  			'BLOCK_SIZE'			=> ( !empty( $block_size ) ? $block_size : '100%' ),
  			'EDIT_ACTION'			=> $edit_url,
***************
*** 1507,1511 ****
  			'EDITCP_SHOW' 			=> $mx_page->editcp_show ? '' : 'none',
  			'S_HIDDEN_FORM_FIELDS'	=> $s_hidden_fields
! 		));
  	}
  
--- 1507,1520 ----
  			'EDITCP_SHOW' 			=> $mx_page->editcp_show ? '' : 'none',
  			'S_HIDDEN_FORM_FIELDS'	=> $s_hidden_fields
! 		);
! 
! 		if ($overall_header)
! 		{
! 			$layouttemplate->assign_block_vars('editcp', $temp_array);
! 		}
! 		else
! 		{
! 			$layouttemplate->assign_block_vars('layout_column.blocks.edit', $temp_array);
! 		}
  	}