[mxbb-commits] core/includes mx_functions_core.php, 1.52, 1.52.2.1 page_header.php, 1.45, 1.45.2.1

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

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

Modified Files:
      Tag: core28x
	mx_functions_core.php page_header.php 
Log Message:
Page auth and overall_header blockCP

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -C2 -d -r1.45 -r1.45.2.1
*** page_header.php	22 Jul 2007 20:59:56 -0000	1.45
--- page_header.php	12 Aug 2007 22:29:17 -0000	1.45.2.1
***************
*** 461,502 ****
  // Navigation Menu in overall_header
  //
! if (!is_object($mx_block))
  {
! 	$mx_block = new mx_block();
! }
  
! $block_id = $mx_page->page_navigation_block;
  
! if(!empty($block_id) )
! {
! 	define('MX_OVERALL_NAVIGATION', true);
  
! 	$mx_block->init( $block_id );
  
! 	//
! 	// Define $module_root_path, to be used within blocks
! 	//
! 	$module_root_path = $mx_root_path . $mx_block->module_root_path;
  
! 	$template = new mx_Template($mx_root_path . 'templates/'. $theme['template_name']);
  
! 	//
! 	// Include block file and cache output
! 	//
! 	ob_start();
! 	include($module_root_path . $mx_block->block_file);
! 	$overall_navigation_menu = ob_get_contents();
! 	ob_end_clean();
  
! 	//
! 	// Output Block contents
! 	//
! 	$layouttemplate->assign_vars(array(
! 		'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);
  	}
  }
--- 461,505 ----
  // Navigation Menu in overall_header
  //
! if ($mx_page->auth_view || $mx_page->auth_mod)
  {
! 	if (!is_object($mx_block))
! 	{
! 		$mx_block = new mx_block();
! 	}
  
! 	$block_id = $mx_page->page_navigation_block;
  
! 	if(!empty($block_id) )
! 	{
! 		define('MX_OVERALL_NAVIGATION', true);
  
! 		$mx_block->init( $block_id );
  
! 		//
! 		// Define $module_root_path, to be used within blocks
! 		//
! 		$module_root_path = $mx_root_path . $mx_block->module_root_path;
  
! 		$template = new mx_Template($mx_root_path . 'templates/'. $theme['template_name']);
  
! 		//
! 		// Include block file and cache output
! 		//
! 		ob_start();
! 		include($module_root_path . $mx_block->block_file);
! 		$overall_navigation_menu = ob_get_contents();
! 		ob_end_clean();
  
! 		//
! 		// Output Block contents
! 		//
! 		$layouttemplate->assign_vars(array(
! 			'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.52
retrieving revision 1.52.2.1
diff -C2 -d -r1.52 -r1.52.2.1
*** mx_functions_core.php	6 Aug 2007 21:11:42 -0000	1.52
--- mx_functions_core.php	12 Aug 2007 22:29:16 -0000	1.52.2.1
***************
*** 2532,2535 ****
--- 2532,2536 ----
  
  	var $auth_view = false;
+ 	var $auth_mod = false;
  	var $auth_ip = false;
  	var $phpbb_stats = '-1';
***************
*** 2711,2714 ****
--- 2712,2716 ----
  		$this->_auth_ary = $this->auth();
  		$this->auth_view = $this->_auth_ary['auth_view'];
+ 		$this->auth_mod = $this->_auth_ary['auth_mod'];
  		$this->auth_ip = $mx_ip->auth($this->info['ip_filter']);