[mxbb-commits] core/modules/mx_coreblocks mx_google.php,1.5,1.6 mx_includex.php,1.3,1.4 mx_language.

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

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

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

Index: mx_language.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_language.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mx_language.php	6 Mar 2005 01:10:13 -0000	1.7
--- mx_language.php	19 Apr 2005 17:14:19 -0000	1.8
***************
*** 19,85 ****
   *    (at your option) any later version.
   */
!  
! if ( !defined( 'IN_PORTAL' ) )
  {
! 	die( "Hacking attempt" );
  }
  
! if ( isset( $HTTP_POST_VARS['change_default_lang'] ) && $userdata['user_level'] == ADMIN )
  {
! 	$board_config['default_lang'] = ( isset( $HTTP_POST_VARS['default_lang'] ) ) ? $HTTP_POST_VARS['default_lang'] : $board_config['default_lang'];
  
  	$sql = "UPDATE " . CONFIG_TABLE . " SET
! 			config_value = '" . str_replace( "\'", "''", $board_config['default_lang'] ) . "'
! 			WHERE config_name = 'default_lang'";
! 	if ( !$db->sql_query( $sql ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Failed to update default language configuration for $config_name", "", __LINE__, __FILE__, $sql );
  	}
  }
  
! if ( isset( $HTTP_POST_VARS['change_user_lang'] ) && $userdata['session_logged_in'] )
  {
! 	$userdata['user_lang'] = ( isset( $HTTP_POST_VARS['user_lang'] ) ) ? $HTTP_POST_VARS['user_lang'] : $board_config['default_lang'];
! 	$mx_user_id = $userdata['user_id'];
  
  	$sql = "UPDATE " . USERS_TABLE . " SET
! 			user_lang = '" . str_replace( "\'", "''", $userdata['user_lang'] ) . "'
! 			WHERE user_id = '$mx_user_id'";
! 	if ( !$db->sql_query( $sql ) )
  	{
! 		mx_message_die( GENERAL_ERROR, "Failed to update user lang configuration for $config_name", "", __LINE__, __FILE__, $sql );
  	}
  }
  
! $template->set_filenames( array( 
! 		"body_language" => 'mx_language.tpl' ) 
! 	);
  
  if ( $userdata['user_level'] == ADMIN )
  {
! 	$template->assign_block_vars( "switch_is_admin", array( 'L_CHANGE_NOW' => $lang['Change_default_lang'],
! 			'LANG_SELECT' => language_select( $board_config['default_lang'], 'default_lang' ) 
! 			) );
  }
  if ( $userdata['session_logged_in'] )
  {
! 	$template->assign_block_vars( "switch_is_user", array( 'L_CHANGE_NOW' => $lang['Change_user_lang'],
! 			'LANG_SELECT' => language_select( $userdata['user_lang'], 'user_lang' ) 
! 			) );
  }
  
! $template->assign_vars( array( 'ACTION_URL' => $mx_root_path . "index." . $phpEx . "?page=" . $page_id,
! 		'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ),
! 		'L_SELECT_LANG' => $lang['Board_lang'],
! 		'L_CHANGE_NOW' => $lang['Change'],
! 		'L_TITLE' => $lang['Portal_lang'],
! 		'L_SUBTITLE' => $lang['SELECTGUILANG'] 
! 		) );
  
  // Display only when the user is logged in
! 
  if ( $userdata['session_logged_in'] )
  {
! 	$template->pparse( "body_language" );
  }
  else 
--- 19,92 ----
   *    (at your option) any later version.
   */
! 
! if ( !defined('IN_PORTAL') )
  {
! 	die("Hacking attempt");
  }
  
! $language = $mx_request_vars->post('change_default_lang', MX_TYPE_NO_TAGS, '');
! $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' );
! if ( !empty($language) && $userdata['user_level'] == ADMIN )
  {
! 	$board_config['default_lang'] = $language;
  
  	$sql = "UPDATE " . CONFIG_TABLE . " SET
! 		config_value = '$language'
! 		WHERE config_name = 'default_lang'";
! 	if ( !$db->sql_query($sql) )
  	{
! 		mx_message_die(GENERAL_ERROR, "Failed to update default language configuration", '', __LINE__, __FILE__, $sql);
  	}
  }
  
! $language = $mx_request_vars->post('change_user_lang', MX_TYPE_NO_TAGS, '');
! $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' );
! if ( !empty($language) && $userdata['session_logged_in'] )
  {
! 	$userdata['user_lang'] = $language;
  
  	$sql = "UPDATE " . USERS_TABLE . " SET
! 		user_lang = '$language'
! 		WHERE user_id = '" . $userdata['user_id'] . "'";
! 	if ( !$db->sql_query($sql) )
  	{
! 		mx_message_die(GENERAL_ERROR, "Failed to update user lang configuration", "", __LINE__, __FILE__, $sql);
  	}
  }
  
! $template->set_filenames(array(
! 	'body_language' => 'mx_language.tpl')
! );
  
  if ( $userdata['user_level'] == ADMIN )
  {
! 	$template->assign_block_vars('switch_is_admin', array(
! 		'L_CHANGE_NOW' => $lang['Change_default_lang'],
! 		'LANG_SELECT' => language_select($board_config['default_lang'], 'default_lang')
! 	));
  }
  if ( $userdata['session_logged_in'] )
  {
! 	$template->assign_block_vars('switch_is_user', array(
! 		'L_CHANGE_NOW' => $lang['Change_user_lang'],
! 		'LANG_SELECT' => language_select($userdata['user_lang'], 'user_lang')
! 	));
  }
  
! $template->assign_vars(array(
! 	'ACTION_URL' => $mx_root_path . "index.$phpEx?page=" . $page_id,
! 	'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ),
! 	'L_SELECT_LANG' => $lang['Board_lang'],
! 	'L_CHANGE_NOW' => $lang['Change'],
! 	'L_TITLE' => $lang['Portal_lang'],
! 	'L_SUBTITLE' => $lang['SELECTGUILANG'] 
! ));
  
+ //
  // Display only when the user is logged in
! //
  if ( $userdata['session_logged_in'] )
  {
! 	$template->pparse('body_language');
  }
  else 

Index: mx_includex.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_includex.php	17 Mar 2005 11:30:36 -0000	1.3
--- mx_includex.php	19 Apr 2005 17:14:19 -0000	1.4
***************
*** 19,113 ****
   *    (at your option) any later version.
   */
!  
! if ( !defined( 'IN_PORTAL' ) )
  {
! 	die( "Hacking attempt" );
  }
  
! $block_config = read_block_config( $block_id );
  $title = $block_config[$block_id]['block_title'];
  
  $select_row = array('x_listen', 'x_iframe', 'x_textfile', 'x_multimedia', 'x_pic', 'x_format');
  
! $iframe_mode = $select_row[$block_config[$block_id]['x_mode']['parameter_value']] ;
  
! $x_mode = $iframe_mode == 'x_listen' && !empty( $HTTP_GET_VARS['x_mode'] ) ? $HTTP_GET_VARS['x_mode'] : $iframe_mode ;
  
! $x_1 = $iframe_mode == 'x_listen' && !empty( $HTTP_GET_VARS['x_1'] ) ? $HTTP_GET_VARS['x_1'] : $block_config[$block_id]['x_1']['parameter_value'] ;
! $x_2 = $iframe_mode == 'x_listen' && !empty( $HTTP_GET_VARS['x_2'] ) ? $HTTP_GET_VARS['x_2'] : $block_config[$block_id]['x_2']['parameter_value'] ;
! $x_3 = $iframe_mode == 'x_listen' && !empty( $HTTP_GET_VARS['x_3'] ) ? $HTTP_GET_VARS['x_3'] : $block_config[$block_id]['x_3']['parameter_value'] ;
  
  // Start output of page
  
! $template->set_filenames( array( 
! 		"includex_block" => "mx_includex.tpl" ) 
! 	);
  
! $template->assign_vars( array( 
! 		'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ),
! 		'L_TITLE' => ( !empty( $lang[$title] ) ? $lang[$title] : $title )
! 		) );
  			
! switch ( $x_mode )
  {
! 	case 'x_listen': // Listen
! 	break;
! 	
! 	case 'x_iframe': // Iframe
  		$file_url = $x_1;
! 		
! 		if ( substr_count( $file_url, "http://" ) == 0 )
  		{
  			$file_url = PORTAL_URL . $file_url;
  		}
! 		
! 		$template->assign_block_vars( 'iframe_mode', array(
  			'FILE_URL' => $file_url,
! 			'IFRAME_HEIGHT' => $x_2		
! 		) );
! 	break;
! 	
! 	case 'x_textfile': // Textfile
  		ob_start();
! 		@readfile( $mx_root_path . $file );
  		$file_contents = ob_get_contents();
  		ob_clean();
! 		
! 		$template->assign_block_vars( 'textfile_mode', array(
  			'FILE_CONTENTS' => $file_contents
! 		) );
! 	break;
! 	
! 	case 'x_multimedia': // Multimedia
! 	
! 	
! 		$template->assign_block_vars( 'multimedia_mode', array(
  			'MEDIA_URL' => PORTAL_URL . $x_1,
  			'WIDTH' => !empty($x_2) ? 'width="'.$x_2.'"' : '',
  			'HEIGHT' => !empty($x_3) ? 'height="'.$x_3.'"' : ''
! 			
! 		) );	
! 	break;
! 	
! 	case 'x_pic': // Pic
! 	
! 		$template->assign_block_vars( 'pic_mode', array(
  			'FILE_CONTENTS' => $file_contents
! 		) );	
! 	break;
! 	
! 	case 'x_format': // Formatted file
! 	// not ready ;) do nothing
! 	break;
! 	
! 	default:
! 		// Hidden
  		$block_rows[$block]['show_title'] = 0;
  		$block_rows[$block]['show_block'] = 0;
  		return;
- 	break;
  }
  
! $template->pparse( "includex_block" );
  
  ?>
\ No newline at end of file
--- 19,107 ----
   *    (at your option) any later version.
   */
! 
! if ( !defined('IN_PORTAL') )
  {
! 	die("Hacking attempt");
  }
  
! $block_config = read_block_config($block_id);
  $title = $block_config[$block_id]['block_title'];
  
  $select_row = array('x_listen', 'x_iframe', 'x_textfile', 'x_multimedia', 'x_pic', 'x_format');
  
! $iframe_mode = $select_row[$block_config[$block_id]['x_mode']['parameter_value']];
  
! $x_mode = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_mode']) ? $HTTP_GET_VARS['x_mode'] : $iframe_mode );
  
! $x_1 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_1']) ? $HTTP_GET_VARS['x_1'] : $block_config[$block_id]['x_1']['parameter_value'] );
! $x_2 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_2']) ? $HTTP_GET_VARS['x_2'] : $block_config[$block_id]['x_2']['parameter_value'] );
! $x_3 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_3']) ? $HTTP_GET_VARS['x_3'] : $block_config[$block_id]['x_3']['parameter_value'] );
  
  // Start output of page
  
! $template->set_filenames(array(
! 	'includex_block' => 'mx_includex.tpl')
! );
  
! $template->assign_vars(array(
! 	'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ),
! 	'L_TITLE' => ( !empty($lang[$title]) ? $lang[$title] : $title )
! ));
  			
! switch( $x_mode )
  {
! 	case 'x_listen':		// Listen
! 		break;
! 
! 	case 'x_iframe':		// Iframe
  		$file_url = $x_1;
! 
! 		if ( substr_count($file_url, 'http://') == 0 )
  		{
  			$file_url = PORTAL_URL . $file_url;
  		}
! 
! 		$template->assign_block_vars('iframe_mode', array(
  			'FILE_URL' => $file_url,
! 			'IFRAME_HEIGHT' => $x_2
! 		));
! 		break;
! 
! 	case 'x_textfile':		// Textfile
  		ob_start();
! 		@readfile($mx_root_path . $file);
  		$file_contents = ob_get_contents();
  		ob_clean();
! 
! 		$template->assign_block_vars('textfile_mode', array(
  			'FILE_CONTENTS' => $file_contents
! 		));
! 		break;
! 
! 	case 'x_multimedia':	// Multimedia
! 		$template->assign_block_vars('multimedia_mode', array(
  			'MEDIA_URL' => PORTAL_URL . $x_1,
  			'WIDTH' => !empty($x_2) ? 'width="'.$x_2.'"' : '',
  			'HEIGHT' => !empty($x_3) ? 'height="'.$x_3.'"' : ''
! 		));
! 		break;
! 
! 	case 'x_pic':			// Pic
! 		$template->assign_block_vars('pic_mode', array(
  			'FILE_CONTENTS' => $file_contents
! 		));
! 		break;
! 
! 	case 'x_format':		// Formatted file
! 		// not ready ;) do nothing
! 		break;
! 
! 	default:				// Hidden
  		$block_rows[$block]['show_title'] = 0;
  		$block_rows[$block]['show_block'] = 0;
  		return;
  }
  
! $template->pparse('includex_block');
  
  ?>
\ No newline at end of file

Index: mx_google.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_google.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mx_google.php	9 Jan 2005 21:55:44 -0000	1.5
--- mx_google.php	19 Apr 2005 17:14:18 -0000	1.6
***************
*** 20,37 ****
   */
   
! if ( !defined( 'IN_PORTAL' ) )
  {
! 	die( "Hacking attempt" );
  }
  
! $template->set_filenames( array( 'body_google' => 'mx_google.tpl' 
! 		) );
  
! $template->assign_vars( array( 'BLOCK_SIZE' => $block_size,
! 		'L_SEARCH' => $lang['Search'],
! 		'L_TITLE' => 'Google' 
! 		) );
  
! $template->pparse( "body_google" );
  
  ?>
\ No newline at end of file
--- 20,39 ----
   */
   
! if ( !defined('IN_PORTAL') )
  {
! 	die("Hacking attempt");
  }
  
! $template->set_filenames(array(
! 	'body_google' => 'mx_google.tpl')
! );
  
! $template->assign_vars(array(
! 	'BLOCK_SIZE' => $block_size,
! 	'L_SEARCH' => $lang['Search'],
! 	'L_TITLE' => 'Google'
! ));
  
! $template->pparse('body_google');
  
  ?>
\ No newline at end of file

[mxbb-commits] core/modules/mx_coreblocks mx_google.php,1.5,1.6 mx_includex.php,1.3,1.4 mx_language.

[mxbb-commits] core/modules/mx_coreblocks mx_google.php,1.5,1.6 mx_includex.php,1.3,1.4 mx_language.php,1.7,1.8