[mxbb-commits] core index.php,1.32,1.33

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

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

Modified Files:
	index.php 
Log Message:
Fixed some named array with non-quoted indexes and code layout.
Added use of new mx_request_vars class.

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** index.php	19 Apr 2005 13:51:54 -0000	1.32
--- index.php	19 Apr 2005 19:59:32 -0000	1.33
***************
*** 32,45 ****
  $view_page = false;
  
  // 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);
  
- // End session management
  
  if ( $mx_request_vars->is_request('mx_copy') )
--- 32,46 ----
  $view_page = false;
  
+ //
  // 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') )
***************
*** 48,54 ****
  }
  
  // Load page vars
  // Load http_session variables if populated, else consult db and populate http_session
! 
  $mx_session_time = isset($HTTP_SESSION_VARS['mx_session_recached']) ? $HTTP_SESSION_VARS['mx_session_recached'] : $userdata['session_start'];
  if ( empty($HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]) || $portal_config['portal_recached'] > $mx_session_time )
--- 49,56 ----
  }
  
+ //
  // Load page vars
  // Load http_session variables if populated, else consult db and populate http_session
! //
  $mx_session_time = isset($HTTP_SESSION_VARS['mx_session_recached']) ? $HTTP_SESSION_VARS['mx_session_recached'] : $userdata['session_start'];
  if ( empty($HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]) || $portal_config['portal_recached'] > $mx_session_time )
***************
*** 63,68 ****
  }
  
  // Now use the session data
! 
  $page_row = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['page_info'];
  	
--- 65,71 ----
  }
  
+ //
  // Now use the session data
! //
  $page_row = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['page_info'];
  	
***************
*** 77,81 ****
--- 80,86 ----
  $page_ov_header = $page_row['page_header'];
  
+ //
  // Page auth
+ //
  $is_auth_ary = page_auth(AUTH_VIEW, $userdata, $page_row['page_auth_view'], $page_row['page_auth_view_group']);
  
***************
*** 90,99 ****
  }
  
  // Output header
! 
  include($mx_root_path . 'includes/page_header.' . $phpEx);
  
  // Initialize template
! 
  $layouttemplate = new mx_Template($template->root, $board_config, $db);
  
--- 95,106 ----
  }
  
+ //
  // Output header
! //
  include($mx_root_path . 'includes/page_header.' . $phpEx);
  
+ //
  // Initialize template
! //
  $layouttemplate = new mx_Template($template->root, $board_config, $db);
  
***************
*** 102,107 ****
  );
  
  // Generate the fold/unfold menu navigation switches (cookie based)
! 
  if ( !empty($HTTP_COOKIE_VARS['phpbbEdit_Blocks']) )
  {
--- 109,115 ----
  );
  
+ //
  // Generate the fold/unfold menu navigation switches (cookie based)
! //
  if ( !empty($HTTP_COOKIE_VARS['phpbbEdit_Blocks']) )
  {
***************
*** 120,125 ****
  // ------------------------------------------------------------------------------------------------------------
  
  // Page columns
! 
  for( $column = 0; $column < $total_column; $column++ )
  {
--- 128,134 ----
  // ------------------------------------------------------------------------------------------------------------
  
+ //
  // Page columns
! //
  for( $column = 0; $column < $total_column; $column++ )
  {
***************
*** 147,152 ****
  	}
  
  	// Pass column data
! 
  	$layouttemplate->assign_block_vars('layout_column', array(
  		'COL_CLASS'		=> $colclass,
--- 156,162 ----
  	}
  
+ 	//
  	// Pass column data
! 	//
  	$layouttemplate->assign_block_vars('layout_column', array(
  		'COL_CLASS'		=> $colclass,
***************
*** 155,331 ****
  	$column_contents = array();
  
  	// Page blocks
! 
  	$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'] )
! 		{ 
! 			$block_id = $mx_block_id = $block_rows[$block]['block_id'];
! 			$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();
  
! 				// Pass block data
! 				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%' )
! 					));
  
! 					// 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'] . '" />';
! 				$s_hidden_fields .= '<input type="hidden" name="portalpage" value="' . $page_id . '" />';
! 				$s_hidden_fields .= '<input type="hidden" name="mode" value="setting" />';
! 				$s_hidden_fields .= '<input type="hidden" name="f" value="' . intval($HTTP_GET_VARS['f']) . '" />';
! 				$s_hidden_fields .= '<input type="hidden" name="t" value="' . intval($HTTP_GET_VARS['t']) . '" />';
! 				$s_hidden_fields .= '<input type="hidden" name="p" value="' . intval($HTTP_GET_VARS['p']) . '" />';
  
! 				// 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());
! 					}
  				}
  
! 				$block_desc = !empty($block_rows[$block]['block_desc']) ? ' (' . $block_rows[$block]['block_desc'] . ')' : '';
! 				$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
  } // for ... column
  
--- 165,354 ----
  	$column_contents = array();
  
+ 	//
  	// Page blocks
! 	//
  	$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'] )
+ 		{
+ 			continue;
+ 		}
  
! 		$block_id = $mx_block_id = $block_rows[$block]['block_id'];
! 		$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();
  
! 			//
! 			// Pass block data
! 			//
! 			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%' )
! 				));
  
! 				//
! 				// 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'] . '" />';
! 			$s_hidden_fields .= '<input type="hidden" name="portalpage" value="' . $page_id . '" />';
! 			$s_hidden_fields .= '<input type="hidden" name="mode" value="setting" />';
! 			$s_hidden_fields .= '<input type="hidden" name="f" value="' . intval($HTTP_GET_VARS['f']) . '" />';
! 			$s_hidden_fields .= '<input type="hidden" name="t" value="' . intval($HTTP_GET_VARS['t']) . '" />';
! 			$s_hidden_fields .= '<input type="hidden" name="p" value="' . intval($HTTP_GET_VARS['p']) . '" />';
  
! 			//
! 			// 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());
  				}
+ 			}
  
! 			$block_desc = !empty($block_rows[$block]['block_desc']) ? ' (' . $block_rows[$block]['block_desc'] . ')' : '';
! 			$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
+ 
  } // for ... column