[mxbb-commits] core index.php,1.26,1.27

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

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

Modified Files:
	index.php 
Log Message:
Code clean-up. Fixed usage of mx_request_vars.

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** index.php	21 Mar 2005 20:59:32 -0000	1.26
--- index.php	3 Apr 2005 12:54:24 -0000	1.27
***************
*** 26,31 ****
  $mx_root_path = "./";
  
! include_once( $mx_root_path . 'extension.inc' );
! include_once( $mx_root_path . 'common.' . $phpEx );
  
  $view_page = false;
--- 26,31 ----
  $mx_root_path = "./";
  
! include($mx_root_path . 'extension.inc');
! include($mx_root_path . 'common.' . $phpEx);
  
  $view_page = false;
***************
*** 33,43 ****
  // Page selector
  
! $page_id = $mx_request_vars->is_get('page') ? $mx_request_vars->get('page', MX_TYPE_INT, '1') : $mx_request_vars->post('page', MX_TYPE_INT, '1');
  
  // Start session management
! $userdata = session_pagestart( $user_ip, - ( 1000 + $page_id ) );
! mx_init_userprefs( $userdata );
  
! if ( $mx_request_vars->is_get('mx_copy') || $mx_request_vars->is_post('mx_copy') )
  {
  	compose_mx_copy();
--- 33,43 ----
  // Page selector
  
! $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
  
  // Start session management
! $userdata = session_pagestart($user_ip, - ( 1000 + $page_id ));
! mx_init_userprefs($userdata);
  
! if ( $mx_request_vars->is_request('mx_copy') )
  {
  	compose_mx_copy();
***************
*** 51,57 ****
  {
  	$HTTP_SESSION_VARS['mx_session_recached'] = $portal_config['portal_recached'];
! 	if ( defined( 'MX_DEBUG' ) )
  	{
! 		echo( 'populating page block http_session' );
  	}
  	// Populate all mx_pages session vars, for faster navigation
--- 51,57 ----
  {
  	$HTTP_SESSION_VARS['mx_session_recached'] = $portal_config['portal_recached'];
! 	if ( defined('MX_DEBUG') )
  	{
! 		echo('populating page block http_session');
  	}
  	// Populate all mx_pages session vars, for faster navigation
***************
*** 62,69 ****
  	
  $block_rows = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['blocks'];
! $total_block = count( $block_rows );
  	
  $column_rows = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['columns'];
! $total_column = count( $column_rows );
  	
  $page_title .= $page_row['page_name'];
--- 62,69 ----
  	
  $block_rows = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['blocks'];
! $total_block = count($block_rows);
  	
  $column_rows = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['columns'];
! $total_column = count($column_rows);
  	
  $page_title .= $page_row['page_name'];
***************
*** 72,104 ****
  
  // Page auth
! $is_auth_ary = array();
! $is_auth_ary = page_auth( AUTH_VIEW, $userdata, $page_row['page_auth_view'], $page_row['page_auth_view_group'] );
  
  if ( !$is_auth_ary[auth_view] && $userdata['session_logged_in'] )
  {
! 	$message = empty( $lang['Page_Not_Authorised'] ) ? "Sorry, but you don't have privilege to access this page." : $lang['Page_Not_Authorised'];
! 	mx_message_die( GENERAL_MESSAGE, $message, "", __LINE__, __FILE__, "" );
  }
! else if ( !$is_auth_ary[auth_view] && !$userdata['session_logged_in'] )
  {
! 	mx_redirect( append_sid( $mx_root_path . "login.$phpEx?redirect=" . mx_this_url(), true ) );
  }
! include( $mx_root_path . 'includes/page_header.' . $phpEx );
  
  // Initialize template
  
! $layouttemplate = new mx_Template( $template->root, $board_config, $db );
  
- $layouttemplate->set_filenames( array( 
- 		"mx_main_layout" => "mx_main_layout.tpl" ) 
- 	);
- 	
  // Generate the fold/unfold menu navigation switches (cookie based)
  
! if ( ( $HTTP_COOKIE_VARS['phpbbEdit_Blocks'] ) != '' )
  {
  	$edit_on = $HTTP_COOKIE_VARS['phpbbEdit_Blocks'];
  }
! else if ( $userdata['user_level'] == ADMIN )
  {
  	$edit_on = true;
--- 72,103 ----
  
  // Page auth
! $is_auth_ary = page_auth(AUTH_VIEW, $userdata, $page_row['page_auth_view'], $page_row['page_auth_view_group']);
  
  if ( !$is_auth_ary[auth_view] && $userdata['session_logged_in'] )
  {
! 	$message = empty($lang['Page_Not_Authorised']) ? "Sorry, but you don't have privilege to access this page." : $lang['Page_Not_Authorised'];
! 	mx_message_die(GENERAL_MESSAGE, $message, '', __LINE__, __FILE__, '');
  }
! elseif ( !$is_auth_ary[auth_view] && !$userdata['session_logged_in'] )
  {
! 	mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . mx_this_url(), true));
  }
! include($mx_root_path . 'includes/page_header.' . $phpEx);
  
  // Initialize template
  
! $layouttemplate = new mx_Template($template->root, $board_config, $db);
! 
! $layouttemplate->set_filenames(array(
! 	'mx_main_layout' => 'mx_main_layout.tpl')
! );
  
  // Generate the fold/unfold menu navigation switches (cookie based)
  
! if ( !empty($HTTP_COOKIE_VARS['phpbbEdit_Blocks']) )
  {
  	$edit_on = $HTTP_COOKIE_VARS['phpbbEdit_Blocks'];
  }
! elseif ( $userdata['user_level'] == ADMIN )
  {
  	$edit_on = true;
***************
*** 119,147 ****
  	// Send optional column class
  	
! 	if  ( $total_column == 1 )
  	{
  		$colclass = 'middlecol';
  	}
! 	else 
  	{
! 		switch ( $column )
  		{
! 			case '0':
  				$colclass = 'leftcol';
  				break;
! 			case '1':
  				$colclass = 'middlecol';
  				break;
! 			case '2':
  				$colclass = 'rightcol';
  				break;
  		}
  	}
! 	
  	// Pass column data
! 	
! 	$layouttemplate->assign_block_vars( 'layout_column', array( 'COL_CLASS' => $colclass,
! 			'BLOCK_SIZE' => $block_size 
! 			) );
  	$column_contents = array();
  
--- 118,147 ----
  	// Send optional column class
  	
! 	if ( $total_column == 1 )
  	{
  		$colclass = 'middlecol';
  	}
! 	else
  	{
! 		switch( $column )
  		{
! 			case 0:
  				$colclass = 'leftcol';
  				break;
! 			case 1:
  				$colclass = 'middlecol';
  				break;
! 			case 2:
  				$colclass = 'rightcol';
  				break;
  		}
  	}
! 
  	// Pass column data
! 
! 	$layouttemplate->assign_block_vars('layout_column', array(
! 		'COL_CLASS'		=> $colclass,
! 		'BLOCK_SIZE'	=> $block_size
! 	));
  	$column_contents = array();
  
***************
*** 149,157 ****
  
  	$show_edit_blocks_icon = false;
! 	
  	for( $block = 0; $block < $total_block; $block++ )
  	{
  		// Validate this block is really visible and exists for the column
! 		
  		if ( $column_rows[$column]['column_id'] == $block_rows[$block]['column_id'] )
  		{ 
--- 149,157 ----
  
  	$show_edit_blocks_icon = false;
! 
  	for( $block = 0; $block < $total_block; $block++ )
  	{
  		// Validate this block is really visible and exists for the column
! 
  		if ( $column_rows[$column]['column_id'] == $block_rows[$block]['column_id'] )
  		{ 
***************
*** 159,179 ****
  			$block_file = $block_rows[$block]['function_file'];
  			$dynamic_main_block_id = '';
! 			
  			// Block view auth -----------------------------------------------------------------------------------------------------
! 			
! 			$is_auth_ary = array();
  			$is_auth_ary = block_auth( AUTH_VIEW, $mx_block_id, $userdata, $block_rows[$block]['auth_view'], $block_rows[$block]['auth_view_group'] );
! 			
  			if ( ($is_auth_ary[auth_view] && $block_rows[$block]['show_block'] == 1) || $is_auth_ary[auth_mod] )
  			{
! 				//$layouttemplate->assign_block_vars( 'layoutcol', array() );
! 				$template = new mx_Template( $template->root, $board_config, $db );
  
  				$module_root_path = $block_rows[$block]['module_path'];
! 				
  				$title_class = $block_rows[$block]['function_file'] != 'mx_multiple_blocks.php' ? 'mxthHead' : 'mxthHead_none';
! 				
  				ob_start();
! 				include( $module_root_path . $block_file );
  				$column_contents[$column] = ob_get_contents();
  				ob_end_clean();
--- 159,178 ----
  			$block_file = $block_rows[$block]['function_file'];
  			$dynamic_main_block_id = '';
! 
  			// Block view auth -----------------------------------------------------------------------------------------------------
! 
  			$is_auth_ary = block_auth( AUTH_VIEW, $mx_block_id, $userdata, $block_rows[$block]['auth_view'], $block_rows[$block]['auth_view_group'] );
! 
  			if ( ($is_auth_ary[auth_view] && $block_rows[$block]['show_block'] == 1) || $is_auth_ary[auth_mod] )
  			{
! 				//$layouttemplate->assign_block_vars('layoutcol', array());
! 				$template = new mx_Template($template->root, $board_config, $db);
  
  				$module_root_path = $block_rows[$block]['module_path'];
! 
  				$title_class = $block_rows[$block]['function_file'] != 'mx_multiple_blocks.php' ? 'mxthHead' : 'mxthHead_none';
! 
  				ob_start();
! 				include($module_root_path . $block_file);
  				$column_contents[$column] = ob_get_contents();
  				ob_end_clean();
***************
*** 182,237 ****
  				if ( $block_rows[$block]['show_block'] == 1 || $is_auth_ary[auth_mod] )
  				{
! 					$layouttemplate->assign_block_vars( 'layout_column.blocks', array( 
! 						'BLOCK' => $column_contents[$column],
! 						'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ) 
! 						) );
! 				
  					//if ( $block_rows[$block]['function_file'] != 'mx_multiple_blocks.php' )
  					//{
  					//	$layouttemplate->assign_block_vars('layout_column.blocks.no_split', array());
  					//}				
! 					
  					// Switch: graphical block borders
! 					
! 					if ( !empty( $page_row['page_graph_border'] ) )
  					{
  						if ( file_exists($mx_root_path . TEMPLATE_ROOT_PATH . 'images/' . $page_row['page_graph_border'] . '1-1.gif') )
  						{
! 							$layouttemplate->assign_block_vars( 'layout_column.blocks.graph_border', array( 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,
! 								'PREFIX' => $page_row['page_graph_border'] 
! 								) );
  						}
  					} 
! 					
! 					if ( $block_rows[$block]['show_stats'] == 1 && !empty( $block_rows[$block]['block_time'] ) && !empty( $block_rows[$block]['block_editor_id'] ) )
  					{
! 						$editor_name_tmp = get_userdata( $block_rows[$block]['block_editor_id'] );
  						$editor_name = $editor_name_tmp['username'];
! 						$edit_time = create_date( $board_config['default_dateformat'], $block_rows[$block]['block_time'], $board_config['board_timezone'] ); 
! 	
! 						$layouttemplate->assign_block_vars( 'layout_column.blocks.block_stats', array(
! 							'L_BLOCK_UPDATED' => $lang['Block_updated_by'],
! 							'EDITOR_NAME' => $editor_name,
! 							'EDIT_TIME' => $edit_time
! 						) );
  					}
  					else
  					{
! 						$layouttemplate->assign_block_vars( 'layout_column.blocks.no_stats', array() );
! 					}			
  				}
  			} // End View auth
! 			
  			// Block edit auth ---------------------------------------------------------------------------------
  			$mx_block_edit = false;
! 	
! 			$is_auth_ary = array();
! 			$is_auth_ary = block_auth( AUTH_EDIT, $mx_block_id , $userdata, $block_rows[$block]['auth_edit'], $block_rows[$block]['auth_edit_group'] ); 
! 			
  			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;
! 				
  				// Define some hidden Edit Block parameters
  				$s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
--- 181,236 ----
  				if ( $block_rows[$block]['show_block'] == 1 || $is_auth_ary[auth_mod] )
  				{
! 					$layouttemplate->assign_block_vars('layout_column.blocks', array(
! 						'BLOCK'			=> $column_contents[$column],
! 						'BLOCK_SIZE'	=> ( !empty($block_size) ? $block_size : '100%' )
! 					));
! 
  					//if ( $block_rows[$block]['function_file'] != 'mx_multiple_blocks.php' )
  					//{
  					//	$layouttemplate->assign_block_vars('layout_column.blocks.no_split', array());
  					//}				
! 
  					// Switch: graphical block borders
! 
! 					if ( !empty($page_row['page_graph_border']) )
  					{
  						if ( file_exists($mx_root_path . TEMPLATE_ROOT_PATH . 'images/' . $page_row['page_graph_border'] . '1-1.gif') )
  						{
! 							$layouttemplate->assign_block_vars('layout_column.blocks.graph_border', array(
! 								'TEMPLATE_ROOT_PATH'	=> TEMPLATE_ROOT_PATH,
! 								'PREFIX'				=> $page_row['page_graph_border']
! 							));
  						}
  					} 
! 
! 					if ( $block_rows[$block]['show_stats'] == 1 && !empty($block_rows[$block]['block_time']) && !empty($block_rows[$block]['block_editor_id']) )
  					{
! 						$editor_name_tmp = get_userdata($block_rows[$block]['block_editor_id']);
  						$editor_name = $editor_name_tmp['username'];
! 						$edit_time = create_date($board_config['default_dateformat'], $block_rows[$block]['block_time'], $board_config['board_timezone']);
! 
! 						$layouttemplate->assign_block_vars('layout_column.blocks.block_stats', array(
! 							'L_BLOCK_UPDATED'	=> $lang['Block_updated_by'],
! 							'EDITOR_NAME'		=> $editor_name,
! 							'EDIT_TIME'			=> $edit_time
! 						));
  					}
  					else
  					{
! 						$layouttemplate->assign_block_vars('layout_column.blocks.no_stats', array());
! 					}
  				}
  			} // End View auth
! 
  			// Block edit auth ---------------------------------------------------------------------------------
  			$mx_block_edit = false;
! 
! 			$is_auth_ary = block_auth(AUTH_EDIT, $mx_block_id , $userdata, $block_rows[$block]['auth_edit'], $block_rows[$block]['auth_edit_group']);
! 
  			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;
! 
  				// Define some hidden Edit Block parameters
  				$s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
***************
*** 243,282 ****
  
  				// Switch between different block types
! 				
  				$block_edit_img = ( ( $block_file == 'mx_multiple_blocks.php' ) ? 'block_edit_split.gif' : ( $block_file == 'mx_textblock_blog.php' ? 'block_edit_admin.gif' : 'block_edit.gif' ) ) ;
  				$split_admin_file = !empty( $block_rows[$block]['function_admin'] ) ? $block_rows[$block]['function_admin'] : 'admin/admin_mx_block.php';
  
! 				// Dynamic Block Itself		
  				if ( !empty($dynamic_main_block_id) )
! 				{	
! 					$is_dynamic_auth_ary = array();
! 					$is_dynamic_auth_ary = block_auth( AUTH_EDIT, $dynamic_main_block_id , $userdata, $dynamic_block_config[$dynamic_main_block_id]['auth_edit'], $dynamic_block_config[$dynamic_main_block_id]['auth_edit_group'] ); 
! 			
! 					if ( ($is_dynamic_auth_ary[auth_edit] || $is_dynamic_auth_ary[auth_mod]) )
! 					{					
! 						$block_desc = !empty( $dynamic_block_config[$dynamic_main_block_id]['block_desc'] ) ? ' (' . $dynamic_block_config[$dynamic_main_block_id]['block_desc'] . ')' : '';
! 						$edit_url = append_sid( $mx_root_path . 'admin/admin_mx_block.php' . "?sid=" . $userdata['session_id'] );
  						$edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . 'block_edit_admin.gif' . '" alt="' . $lang['Block_Edit'] . $block_rows[$block]['block_id'] . '" title="' . $lang['Block_Edit'] . ' :: ' . $dynamic_block_config[$dynamic_main_block_id]['block_title'] . $block_desc . '">';
! 	
  						$s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $dynamic_main_block_id . '" />';
! 	
! 						$layouttemplate->assign_block_vars( 'layout_column.blocks.edit', array( 
! 								'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ),
! 								'L_TITLE' => $title,
! 								'L_DESC' => $b_description,
! 								'EDIT_ACTION' => $edit_url,
! 								'EDIT_IMG' => $edit_img,
! 								'TITLECLASS' => $title_class,
! 								'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields 
! 								) );
! 						
! 						if ( $edit_on )
! 						{
! 							$layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_on', array() );
! 						}
! 						else
! 						{
! 							$layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_off', array() );
! 						}		
  					}
  				}
--- 242,273 ----
  
  				// Switch between different block types
! 
  				$block_edit_img = ( ( $block_file == 'mx_multiple_blocks.php' ) ? 'block_edit_split.gif' : ( $block_file == 'mx_textblock_blog.php' ? 'block_edit_admin.gif' : 'block_edit.gif' ) ) ;
  				$split_admin_file = !empty( $block_rows[$block]['function_admin'] ) ? $block_rows[$block]['function_admin'] : 'admin/admin_mx_block.php';
  
! 				// Dynamic Block Itself
  				if ( !empty($dynamic_main_block_id) )
! 				{
! 					$is_dynamic_auth_ary = block_auth(AUTH_EDIT, $dynamic_main_block_id , $userdata, $dynamic_block_config[$dynamic_main_block_id]['auth_edit'], $dynamic_block_config[$dynamic_main_block_id]['auth_edit_group']);
! 
! 					if ( $is_dynamic_auth_ary[auth_edit] || $is_dynamic_auth_ary[auth_mod] )
! 					{
! 						$block_desc = !empty($dynamic_block_config[$dynamic_main_block_id]['block_desc']) ? ' (' . $dynamic_block_config[$dynamic_main_block_id]['block_desc'] . ')' : '';
! 						$edit_url = append_sid($mx_root_path . 'admin/admin_mx_block.php' . "?sid=" . $userdata['session_id']);
  						$edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . 'block_edit_admin.gif' . '" alt="' . $lang['Block_Edit'] . $block_rows[$block]['block_id'] . '" title="' . $lang['Block_Edit'] . ' :: ' . $dynamic_block_config[$dynamic_main_block_id]['block_title'] . $block_desc . '">';
! 
  						$s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $dynamic_main_block_id . '" />';
! 
! 						$layouttemplate->assign_block_vars('layout_column.blocks.edit', array(
! 							'BLOCK_SIZE'			=> ( !empty( $block_size ) ? $block_size : '100%' ),
! 							'L_TITLE'				=> $title,
! 							'L_DESC'				=> $b_description,
! 							'EDIT_ACTION'			=> $edit_url,
! 							'EDIT_IMG'				=> $edit_img,
! 							'TITLECLASS'			=> $title_class,
! 							'S_HIDDEN_FORM_FIELDS'	=> $s_hidden_fields
! 						));
! 
! 						$layouttemplate->assign_block_vars('layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array());
  					}
  				}
***************
*** 285,339 ****
  				$edit_url = append_sid( $mx_root_path . $split_admin_file . "?sid=" . $userdata['session_id'] );
  				$edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . $block_edit_img . '" alt="' . $lang['Block_Edit'] . ' :: ' . $block_rows[$block]['block_title'] . $block_desc . '" title="' . $lang['Block_Edit'] . ' :: ' . $block_rows[$block]['block_title'] . $block_desc . '">';
! 					
  				$s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $mx_block_id . '" />';
  
! 				$layouttemplate->assign_block_vars( 'layout_column.blocks.edit', array( 
! 						'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ),
! 						'L_TITLE' => $title,
! 						'L_DESC' => $b_description,
! 						'EDIT_ACTION' => $edit_url,
! 						'EDIT_IMG' => $edit_img,
! 						'TITLECLASS' => $title_class,
! 						'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields 
! 						) );
  
  				// Is the Block hidden ?
! 					
  				if ( $block_rows[$block]['show_block'] == 0 )
  				{
  					$hidden_img = '<img src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/block_hidden.gif" alt="' . $lang['Hidden_block'] . '">';
! 					$layouttemplate->assign_block_vars( 'layout_column.blocks.edit.hidden_block', array(
! 						'HIDDEN_BLOCK' => $hidden_img
! 					) );
  				}
! 					
  				// Switch: Edit Block
! 					
! 				if ( $edit_on )
! 				{
! 					$layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_on', array() );
! 				}
! 				else
! 				{
! 					$layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_off', array() );
! 				}
  			} // End Edit auth
  
  			// Switch: show block header -------------------
  			if ( $block_rows[$block]['show_block'] == 1 && ( $mx_block_edit || $block_rows[$block]['show_title'] == 1 )  || $is_auth_ary[auth_mod] )
! 			{ 
  			 	$layouttemplate->assign_block_vars('layout_column.blocks.block_header', array());
! 			 	
  				// Switch: show title -------------------
! 				if ( $block_rows[$block]['show_title'] == 1  || $is_auth_ary[auth_mod] )
! 				{ 
  					$this_block_title = $block_rows[$block]['show_title'] == 0  && $is_auth_ary[auth_mod] ? '(' . $block_rows[$block]['block_title'] . ')' : $block_rows[$block]['block_title'];
  				 	$layouttemplate->assign_block_vars('layout_column.blocks.show_title', array(
! 				 		'L_TITLE' => $this_block_title,
! 						'TITLECLASS' => $title_class
  					));
! 				}			 	
  			}
! 		
  		}
  	} // for ... blocks
--- 276,324 ----
  				$edit_url = append_sid( $mx_root_path . $split_admin_file . "?sid=" . $userdata['session_id'] );
  				$edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . $block_edit_img . '" alt="' . $lang['Block_Edit'] . ' :: ' . $block_rows[$block]['block_title'] . $block_desc . '" title="' . $lang['Block_Edit'] . ' :: ' . $block_rows[$block]['block_title'] . $block_desc . '">';
! 
  				$s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $mx_block_id . '" />';
  
! 				$layouttemplate->assign_block_vars('layout_column.blocks.edit', array(
! 					'BLOCK_SIZE'			=> ( !empty( $block_size ) ? $block_size : '100%' ),
! 					'L_TITLE'				=> $title,
! 					'L_DESC'				=> $b_description,
! 					'EDIT_ACTION'			=> $edit_url,
! 					'EDIT_IMG'				=> $edit_img,
! 					'TITLECLASS'			=> $title_class,
! 					'S_HIDDEN_FORM_FIELDS'	=> $s_hidden_fields
! 				));
  
  				// Is the Block hidden ?
! 
  				if ( $block_rows[$block]['show_block'] == 0 )
  				{
  					$hidden_img = '<img src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/block_hidden.gif" alt="' . $lang['Hidden_block'] . '">';
! 					$layouttemplate->assign_block_vars('layout_column.blocks.edit.hidden_block', array(
! 						'HIDDEN_BLOCK'	=> $hidden_img
! 					));
  				}
! 
  				// Switch: Edit Block
! 
! 				$layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array() );
! 
  			} // End Edit auth
  
  			// Switch: show block header -------------------
  			if ( $block_rows[$block]['show_block'] == 1 && ( $mx_block_edit || $block_rows[$block]['show_title'] == 1 )  || $is_auth_ary[auth_mod] )
! 			{
  			 	$layouttemplate->assign_block_vars('layout_column.blocks.block_header', array());
! 
  				// Switch: show title -------------------
! 				if ( $block_rows[$block]['show_title'] == 1 || $is_auth_ary[auth_mod] )
! 				{
  					$this_block_title = $block_rows[$block]['show_title'] == 0  && $is_auth_ary[auth_mod] ? '(' . $block_rows[$block]['block_title'] . ')' : $block_rows[$block]['block_title'];
  				 	$layouttemplate->assign_block_vars('layout_column.blocks.show_title', array(
! 				 		'L_TITLE'		=> $this_block_title,
! 						'TITLECLASS'	=> $title_class
  					));
! 				}
  			}
! 
  		}
  	} // for ... blocks
***************
*** 342,350 ****
  // Output page
  	
! $layouttemplate->pparse( "mx_main_layout" );
  
  // Output footer
  
! include( $mx_root_path . 'includes/page_tail.' . $phpEx );
  
  ?>
\ No newline at end of file
--- 327,335 ----
  // Output page
  	
! $layouttemplate->pparse('mx_main_layout');
  
  // Output footer
  
! include($mx_root_path . 'includes/page_tail.' . $phpEx);
  
  ?>
\ No newline at end of file