[mxbb-commits] core/modules/mx_coreblocks mx_dynamic.php,1.7,1.8

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

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

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

Index: mx_dynamic.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_dynamic.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mx_dynamic.php	17 Mar 2005 11:30:36 -0000	1.7
--- mx_dynamic.php	19 Apr 2005 16:03:24 -0000	1.8
***************
*** 22,41 ****
  if ( !defined( 'IN_PORTAL' ) )
  {
! 	die( "Hacking attempt" );
  }
  
  // Mode setting
! $dynamic_block_config = read_block_config( $block_id );
  
! if ( isset( $HTTP_POST_VARS['dynamic_block'] ) || isset( $HTTP_GET_VARS['dynamic_block'] ) )
! {
! 	$dynamic_block_id = ( isset( $HTTP_POST_VARS['dynamic_block'] ) ) ? intval( $HTTP_POST_VARS['dynamic_block'] ) : intval( $HTTP_GET_VARS['dynamic_block'] );
! }
! else
! {
! 	$dynamic_block_id = intval( $dynamic_block_config[$block_id]['default_block_id']['parameter_value'] );
! }
  
! if ( $dynamic_block_id == '0' )
  {
  	return;
--- 22,36 ----
  if ( !defined( 'IN_PORTAL' ) )
  {
! 	die("Hacking attempt");
  }
  
+ //
  // Mode setting
! //
! $dynamic_block_config = read_block_config($block_id);
  
! $dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, $dynamic_block_config[$block_id]['default_block_id']['parameter_value']);
  
! if ( $dynamic_block_id == 0 )
  {
  	return;
***************
*** 45,80 ****
  
  $sql = "SELECT *
!     		FROM " . COLUMN_BLOCK_TABLE . " bct,
!          	" . BLOCK_TABLE . " blk,
!          	" . FUNCTION_TABLE . " fnc,
!          	" . MODULE_TABLE . " mdl
!     		WHERE blk.function_id = fnc.function_id
!       		AND blk.block_id    = " . $dynamic_block_id . "
!       		AND fnc.module_id   = mdl.module_id
!       		ORDER BY column_id, block_order";
  
! if ( !$q_modules = $db->sql_query( $sql ) )
  {
! 	mx_message_die( GENERAL_ERROR, "Could not query modules information", "", __LINE__, __FILE__, $sql );
  }
  
! if ( $total_block = $db->sql_numrows( $q_modules ) )
  {
! 	$block_rows_dynamic = $db->sql_fetchrow( $q_modules ); 
  }
  
! $block_config_dynamic = read_block_config( $dynamic_block_id );
  
! $is_auth_ary = array();
! $is_auth_ary = block_auth( AUTH_VIEW, $dynamic_block_id, $userdata, $block_config_dynamic[$dynamic_block_id]['auth_view'], $block_config_dynamic[$dynamic_block_id]['auth_view_group'] );
  
  $module_root_path = $block_rows_dynamic['module_path'];
  
! $dynamic_admin_file = !empty( $block_rows_dynamic['function_admin'] ) ? $block_rows_dynamic['function_admin'] : 'admin/admin_mx_block.php';
  
  $block_file = $block_rows_dynamic['function_file'];
  
  // Overwrite with block info
! 
  $dynamic_main_block_id = $mx_block_id; // Main block id
  $mx_block_id = $dynamic_block_id; // Dynamic block id
--- 40,75 ----
  
  $sql = "SELECT *
! 	FROM " . COLUMN_BLOCK_TABLE . " bct,
! 		" . BLOCK_TABLE . " blk,
! 		" . FUNCTION_TABLE . " fnc,
! 		" . MODULE_TABLE . " mdl
! 	WHERE blk.function_id = fnc.function_id
! 		AND blk.block_id = " . $dynamic_block_id . "
! 		AND fnc.module_id = mdl.module_id
! 	ORDER BY column_id, block_order";
  
! if ( !($q_modules = $db->sql_query($sql)) )
  {
! 	mx_message_die(GENERAL_ERROR, "Could not query modules information", "", __LINE__, __FILE__, $sql);
  }
  
! if ( $total_block = $db->sql_numrows($q_modules) )
  {
! 	$block_rows_dynamic = $db->sql_fetchrow($q_modules);
  }
  
! $block_config_dynamic = read_block_config($dynamic_block_id);
  
! $is_auth_ary = block_auth(AUTH_VIEW, $dynamic_block_id, $userdata, $block_config_dynamic[$dynamic_block_id]['auth_view'], $block_config_dynamic[$dynamic_block_id]['auth_view_group']);
  
  $module_root_path = $block_rows_dynamic['module_path'];
  
! $dynamic_admin_file = !empty($block_rows_dynamic['function_admin']) ? $block_rows_dynamic['function_admin'] : 'admin/admin_mx_block.php';
  
  $block_file = $block_rows_dynamic['function_file'];
  
+ //
  // Overwrite with block info
! //
  $dynamic_main_block_id = $mx_block_id; // Main block id
  $mx_block_id = $dynamic_block_id; // Dynamic block id
***************
*** 83,89 ****
  $mx_block_config = $block_config = $block_config_dynamic;
  
! if ( $is_auth_ary[auth_view] && $block_rows_dynamic['show_block'] == 1 || $is_auth_ary[auth_mod] )
  {
! 	include( $module_root_path . $block_file );
  }
  
--- 78,84 ----
  $mx_block_config = $block_config = $block_config_dynamic;
  
! if ( $is_auth_ary['auth_view'] && $block_rows_dynamic['show_block'] == 1 || $is_auth_ary['auth_mod'] )
  {
! 	include($module_root_path . $block_file);
  }