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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	index.php 
Log Message:
Fixed some named array with non-quoted indexes.

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** index.php	16 Apr 2005 21:51:35 -0000	1.31
--- index.php	19 Apr 2005 13:51:54 -0000	1.32
***************
*** 23,29 ****

  //define('MX_DEBUG', 1);
! define( 'IN_PORTAL', 1 );

! $mx_root_path = "./";

  include($mx_root_path . 'extension.inc');
--- 23,29 ----

  //define('MX_DEBUG', 1);
! define('IN_PORTAL', 1);

! $mx_root_path = './';

  include($mx_root_path . 'extension.inc');
***************
*** 52,56 ****

  $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 )
  {
  	$HTTP_SESSION_VARS['mx_session_recached'] = $portal_config['portal_recached'];
--- 52,56 ----

  $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 )
  {
  	$HTTP_SESSION_VARS['mx_session_recached'] = $portal_config['portal_recached'];
***************
*** 80,89 ****
  $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));
--- 80,89 ----
  $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));
***************
*** 171,175 ****
  			// 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'] )
--- 171,175 ----
  			// 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'] )
***************
*** 188,192 ****

  				// Pass block data
! 				if ( $block_rows[$block]['show_block'] == 1 || $is_auth_ary[auth_mod] )
  				{
  					$layouttemplate->assign_block_vars('layout_column.blocks', array(
--- 188,192 ----

  				// Pass block data
! 				if ( $block_rows[$block]['show_block'] == 1 || $is_auth_ary['auth_mod'] )
  				{
  					$layouttemplate->assign_block_vars('layout_column.blocks', array(
***************
*** 230,235 ****
  			$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']) )
--- 230,234 ----
  			$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']) )
***************
*** 242,264 ****
  				$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 = 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 . '">';
--- 241,262 ----
  				$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 . '">';
***************
*** 267,271 ****

  						$layouttemplate->assign_block_vars('layout_column.blocks.edit', array(
! 							'BLOCK_SIZE'			=> ( !empty( $block_size ) ? $block_size : '100%' ),
  							'L_TITLE'				=> $title,
  							'L_DESC'				=> $b_description,
--- 265,269 ----

  						$layouttemplate->assign_block_vars('layout_column.blocks.edit', array(
! 							'BLOCK_SIZE'			=> ( !empty($block_size) ? $block_size : '100%' ),
  							'L_TITLE'				=> $title,
  							'L_DESC'				=> $b_description,
***************
*** 280,285 ****
  				}

! 				$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 . '">';

--- 278,283 ----
  				}

! 				$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 . '">';

***************
*** 287,291 ****

  				$layouttemplate->assign_block_vars('layout_column.blocks.edit', array(
! 					'BLOCK_SIZE'			=> ( !empty( $block_size ) ? $block_size : '100%' ),
  					'L_TITLE'				=> $title,
  					'L_DESC'				=> $b_description,
--- 285,289 ----

  				$layouttemplate->assign_block_vars('layout_column.blocks.edit', array(
! 					'BLOCK_SIZE'			=> ( !empty($block_size) ? $block_size : '100%' ),
  					'L_TITLE'				=> $title,
  					'L_DESC'				=> $b_description,
***************
*** 308,324 ****
  				// 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,
--- 306,322 ----
  				// 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,