[mxbb-commits] core common.php,1.30,1.31 index.php,1.33,1.34

[Markus P. <mar...@us...>]

Update of /cvsroot/mxbb/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9293

Modified Files:
	common.php index.php 
Log Message:
Revised page header/footer.

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** common.php	13 Apr 2005 20:15:55 -0000	1.30
--- common.php	20 Apr 2005 00:20:13 -0000	1.31
***************
*** 184,187 ****
--- 184,188 ----
  $nav_links = array();
  $gen_simple_header = false;
+ $mxbb_footer_addup = array();
  
  @include_once( $mx_root_path . 'config.' . $phpEx );

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** index.php	19 Apr 2005 19:59:32 -0000	1.33
--- index.php	20 Apr 2005 00:20:13 -0000	1.34
***************
*** 114,127 ****
  if ( !empty($HTTP_COOKIE_VARS['phpbbEdit_Blocks']) )
  {
! 	$edit_on = $HTTP_COOKIE_VARS['phpbbEdit_Blocks'];
  }
  elseif ( $userdata['user_level'] == ADMIN )
  {
! 	$edit_on = true;
  }
  else
  {
! 	$edit_on = false;
  }
  
  // Start output of page ---------------------------------------------------------------------------------------
--- 114,128 ----
  if ( !empty($HTTP_COOKIE_VARS['phpbbEdit_Blocks']) )
  {
! 	$mx_show_edit_blocks_on = $HTTP_COOKIE_VARS['phpbbEdit_Blocks'];
  }
  elseif ( $userdata['user_level'] == ADMIN )
  {
! 	$mx_show_edit_blocks_on = true;
  }
  else
  {
! 	$mx_show_edit_blocks_on = false;
  }
+ $mx_show_edit_blocks_icon = false;
  
  // Start output of page ---------------------------------------------------------------------------------------
***************
*** 168,173 ****
  	// Page blocks
  	//
- 	$show_edit_blocks_icon = false;
- 
  	for( $block = 0; $block < $total_block; $block++ )
  	{
--- 169,172 ----
***************
*** 252,256 ****
  		if ( ( ($is_auth_ary['auth_edit'] && $block_rows[$block]['show_block'] == 1 ) || $is_auth_ary['auth_mod']) )
  		{
! 			$show_edit_blocks_icon = true;
  			$mx_block_edit = true;
  
--- 251,255 ----
  		if ( ( ($is_auth_ary['auth_edit'] && $block_rows[$block]['show_block'] == 1 ) || $is_auth_ary['auth_mod']) )
  		{
! 			$mx_show_edit_blocks_icon = true;
  			$mx_block_edit = true;
  
***************
*** 295,299 ****
  					));
  
! 					$layouttemplate->assign_block_vars('layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array());
  				}
  			}
--- 294,298 ----
  					));
  
! 					$layouttemplate->assign_block_vars('layout_column.blocks.edit.switch_edit_' . ( $mx_show_edit_blocks_on ? 'on' : 'off' ), array());
  				}
  			}
***************
*** 329,333 ****
  			// Switch: Edit Block
  			//
! 			$layouttemplate->assign_block_vars('layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array());
  
  		} // End Edit auth
--- 328,332 ----
  			// Switch: Edit Block
  			//
! 			$layouttemplate->assign_block_vars('layout_column.blocks.edit.switch_edit_' . ( $mx_show_edit_blocks_on ? 'on' : 'off' ), array());
  
  		} // End Edit auth