mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] mx_calsnails calendar.php,1.17,1.18 mx_calendar_events.php,1.12,1.13 mx_calendar_query.php,1.7,1.8

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_calsnails
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21830/modules/mx_calsnails

Modified Files:
	calendar.php mx_calendar_events.php mx_calendar_query.php 
Log Message:
Updated all blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: mx_calendar_events.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/mx_calendar_events.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mx_calendar_events.php	12 Oct 2005 15:38:35 -0000	1.12
--- mx_calendar_events.php	23 Oct 2005 18:49:18 -0000	1.13
***************
*** 28,43 ****
  include_once( $module_root_path . 'includes/mx_common.' . $phpEx );
  
! // Read block Configuration
! $title = $block_config[$block_id]['block_title'];
! 
! $block_config = read_block_config( $block_id );
  $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
! $block_title = $block_config[$block_id]['Calendar_Block_Title']['parameter_value'];
! $block_vsize = $block_config[$block_id]['Calendar_Vertical_Size']['parameter_value'];
! $text_length = $block_config[$block_id]['Calendar_Text_Length']['parameter_value'];
! $events_range = $block_config[$block_id]['Calendar_Events_Range']['parameter_value'];
! $events_prev = $block_config[$block_id]['Calendar_Events_Prev']['parameter_value'];
! $events_next = $block_config[$block_id]['Calendar_Events_Next']['parameter_value'];
! $block_datefmt = $block_config[$block_id]['Calendar_Events_dateformat']['parameter_value'];
  
  if ( empty( $block_datefmt ) )
--- 28,44 ----
  include_once( $module_root_path . 'includes/mx_common.' . $phpEx );
  
! //
! // Read Block Settings
! //
! $title = $mx_block->block_info['block_title'];
  $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
! 
! $block_title = $mx_block->get_parameters( 'Calendar_Block_Title' );
! $block_vsize = $mx_block->get_parameters( 'Calendar_Vertical_Size' );
! $text_length = $mx_block->get_parameters( 'Calendar_Text_Length' );
! $events_range = $mx_block->get_parameters( 'Calendar_Events_Range' );
! $events_prev = $mx_block->get_parameters( 'Calendar_Events_Prev' );
! $events_next = $mx_block->get_parameters( 'Calendar_Events_Next' );
! $block_datefmt = $mx_block->get_parameters( 'Calendar_Events_dateformat' );
  
  if ( empty( $block_datefmt ) )
***************
*** 76,80 ****
  
  // Get Calsnails target block
! $cal_block_id = $block_config[$block_id]['target_block']['parameter_value'];
  $cal_page_id = get_page_id( $cal_block_id );
  
--- 77,81 ----
  
  // Get Calsnails target block
! $cal_block_id = $mx_block->get_parameters( 'target_block' );
  $cal_page_id = get_page_id( $cal_block_id );
  

Index: mx_calendar_query.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/mx_calendar_query.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mx_calendar_query.php	1 Oct 2005 14:12:12 -0000	1.7
--- mx_calendar_query.php	23 Oct 2005 18:49:18 -0000	1.8
***************
*** 28,39 ****
  include_once( $module_root_path . 'includes/mx_common.' . $phpEx );
  
! // Read block Configuration
! 
! $block_config = read_block_config( $block_id );
  $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
! $block_title = $block_config[$block_id]['Calendar_Block_Title']['parameter_value'];
! $query_where = $block_config[$block_id]['Calendar_Where']['parameter_value'];
! $query_order = $block_config[$block_id]['Calendar_Order']['parameter_value'];
! $block_datefmt = $block_config[$block_id]['Calendar_Events_dateformat']['parameter_value'];
  if ( empty( $block_datefmt ) )
  {
--- 28,42 ----
  include_once( $module_root_path . 'includes/mx_common.' . $phpEx );
  
! //
! // Read Block Settings
! //
! $title = $mx_block->block_info['block_title'];
  $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
! 
! $block_title = $mx_block->get_parameters( 'Calendar_Block_Title' );
! $query_where = $mx_block->get_parameters( 'Calendar_Where' );
! $query_order = $mx_block->get_parameters( 'Calendar_Order' );
! $block_datefmt = $mx_block->get_parameters( 'Calendar_Events_dateformat' );
! 
  if ( empty( $block_datefmt ) )
  {

Index: calendar.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/calendar.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** calendar.php	1 Oct 2005 14:12:12 -0000	1.17
--- calendar.php	23 Oct 2005 18:49:18 -0000	1.18
***************
*** 75,79 ****
  // +MX001: Begin
  
- // die(var_export($_SESSION));
  if ( !function_exists( 'read_block_config' ) )
  {
--- 75,78 ----
***************
*** 113,130 ****
  include_once( $module_root_path . 'includes/mx_common.' . $phpEx );
  
! // Read block Configuration
! 
! $block_config = read_block_config( $block_id );
  $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
! $title = $block_config[$block_id]['block_title'];
  // Permission variables
! $cal_auth_all = $block_config[$block_id]['auth_all']['parameter_value'] ;
! $cal_auth_reg = $block_config[$block_id]['auth_reg']['parameter_value'] ;
! $cal_filter = $block_config[$block_id]['cal_filter']['parameter_value'] == 'TRUE' ;
! $cal_mod_group = $block_config[$block_id]['cal_mod_group']['parameter_value'];
  // echo($cal_auth_all.$cal_auth_reg.$cal_filter);
  
  // Get Calsnails target block
! $cal_block_id = $block_config[$block_id]['target_block']['parameter_value'];
  $cal_page_id = get_page_id( $cal_block_id );
  
--- 112,130 ----
  include_once( $module_root_path . 'includes/mx_common.' . $phpEx );
  
! //
! // Read Block Settings
! //
! $title = $mx_block->block_info['block_title'];
  $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
! 
  // Permission variables
! $cal_auth_all = $mx_block->get_parameters( 'auth_all' );
! $cal_auth_reg = $mx_block->get_parameters( 'auth_reg' );
! $cal_filter = $mx_block->get_parameters( 'cal_filter' ) == 'TRUE' ;
! $cal_mod_group = $mx_block->get_parameters( 'cal_mod_group' );
  // echo($cal_auth_all.$cal_auth_reg.$cal_filter);
  
  // Get Calsnails target block
! $cal_block_id = $mx_block->get_parameters( 'target_block' );
  $cal_page_id = get_page_id( $cal_block_id );
  
***************
*** 275,279 ****
  // Add EDIT block nav
  // $is_auth_ary = array();
- // $is_auth_ary = block_auth(AUTH_EDIT, $block_id , $userdata, $block_config[$block_id][auth_edit], $block_config[$block_id][auth_edit_group] );
  $is_cal_moderator = !$cal_mode_mini ? mx_is_group_member( $cal_mod_group ) : false;
  
--- 275,278 ----

[mxbb-commits] mx_act activity.php,1.6,1.7 newscore.php,1.6,1.7

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_act
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21756/modules/mx_act

Modified Files:
	activity.php newscore.php 
Log Message:
Updated all blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: newscore.php
===================================================================
RCS file: /cvsroot/mxbb/mx_act/newscore.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** newscore.php	1 Oct 2005 14:11:39 -0000	1.6
--- newscore.php	23 Oct 2005 18:48:57 -0000	1.7
***************
*** 19,30 ****
   */
   
- /*
- define('IN_PHPBB', true);
- $phpbb_root_path = './';
- include($phpbb_root_path . 'extension.inc');
- include($phpbb_root_path . 'common.'.$phpEx);
- include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
- */
- // MX
  if ( !function_exists( 'read_block_config' ) )
  {
--- 19,22 ----
***************
*** 56,64 ****
  else
  { 
! 	
! 	// Read block Configuration
! 	
! 	$block_config = read_block_config( $block_id );
! 	$title = $block_config[$block_id]['block_title'];
  	$block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
  
--- 48,55 ----
  else
  { 
! 	//
! 	// Read Block Settings
! 	//
! 	$title = $mx_block->block_info['block_title'];
  	$block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
  
***************
*** 66,69 ****
--- 57,61 ----
  	global $images;
  }
+ 
  // Need to find Page id
  if ( empty( $page_id ) )
***************
*** 89,111 ****
  	$page_id = get_page_id( $act_block_id );
  
- 	/*
- 	$temp_list = $_SESSION['mx_pages'];
- 	while ( list( $page_idd, $page_roww ) = each( $temp_list ) )
- 	{
- 		$block_countt = count( $page_roww['blocks'] );
- 
- 		for( $j = 0; $j < $block_countt; $j++ )
- 		{
- 			$block_idd = $page_roww['blocks'][$j]['block_id'];
- 
- 			if ( $act_block_id == $block_idd )
- 			{
- 				$page_id = str_replace( 'page_', '', $page_idd );
- 				break;
- 			}
- 		}
- 	}
- 	*/
- 
  	$is_block = true;
  }
--- 81,84 ----

Index: activity.php
===================================================================
RCS file: /cvsroot/mxbb/mx_act/activity.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** activity.php	1 Oct 2005 14:11:39 -0000	1.6
--- activity.php	23 Oct 2005 18:48:57 -0000	1.7
***************
*** 19,81 ****
   */
   
! if ( !function_exists( 'read_block_config' ) )
  {
! 	define( 'IN_PORTAL', true );
! 	$mx_root_path = '../../';
! 	include_once( $mx_root_path . 'extension.inc' );
! 	include_once( $mx_root_path . 'common.' . $phpEx ); 
! 	
! 	// Start session management
! 	
! 	$userdata = session_pagestart( $user_ip, PAGE_INDEX );
! 	mx_init_userprefs( $userdata ); 
! 	
! 	// End session management
! 	
! 	$block_id = ( !empty( $HTTP_GET_VARS['block_id'] ) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id'];
! 	if ( empty( $block_id ) )
! 	{
! 		$sql = "SELECT * FROM " . BLOCK_TABLE . "  WHERE block_title = 'ActivityGames' LIMIT 1";
! 		if ( !$result = $db->sql_query( $sql ) )
! 		{
! 			mx_message_die( GENERAL_ERROR, "Could not query Activity Mod module information", "", __LINE__, __FILE__, $sql );
! 		}
! 		$row = $db->sql_fetchrow( $result );
! 		$block_id = $row['block_id'];
! 	}
! 	$is_block = false;
  }
- else
- { 
- 	
- 	// Read block Configuration
- 	
- 	$block_config = read_block_config( $block_id );
- 	$title = $block_config[$block_id]['block_title'];
- 	$block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
  
! 	$is_block = true;
! 	global $images;
! }
  
  include( $module_root_path . 'includes/act_constants.' . $phpEx );
  include( $module_root_path . 'includes/act_functions.' . $phpEx );
  
! /* Original code
! define('IN_PHPBB', true);
! $phpbb_root_path = './';
! include($phpbb_root_path . 'extension.inc');
! include($phpbb_root_path . 'common.'.$phpEx);
! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
! define('INA_TROPHY', $table_prefix .'ina_top_scores');
! define('INA_CHEAT', $table_prefix .'ina_cheat_fix');
! define('INA_BAN', $table_prefix .'ina_ban');
! 
! // Start session management
! $userdata = session_pagestart($user_ip, PAGE_ACTIVITY);
! init_userprefs($userdata);
! // End session management
! */
  // Make sure the player is registered
  $user_id = $userdata['user_id'];
  if ( $act_config['ina_guest_play'] == "2" )
--- 19,44 ----
   */
   
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
! 	die("Hacking attempt");
  }
  
! //
! // Read Block Settings
! //
! $title = $mx_block->block_info['block_title'];
! $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
! 
! $is_block = true;
  
+ //
+ // Includes
+ //
  include( $module_root_path . 'includes/act_constants.' . $phpEx );
  include( $module_root_path . 'includes/act_functions.' . $phpEx );
  
! //
  // Make sure the player is registered
+ //
  $user_id = $userdata['user_id'];
  if ( $act_config['ina_guest_play'] == "2" )
***************
*** 84,90 ****
  	{
  		mx_message_die( GENERAL_ERROR, $lang['not_logged_in'], $lang['info'] );
- 		// $header_location = ( @preg _match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
- 		// header($header_location . append_sid("login.$phpEx?redirect=activity.$phpEx", true));
- 		// exit;
  	}
  }
--- 47,50 ----
***************
*** 409,417 ****
  		"L_HIGHSCORES_TITLE" => $lang['game_highscores'], 
  		) ); 
  // Generate page
! if ( !$is_block )
! {
! 	include( $mx_root_path . 'includes/page_header.' . $phpEx );
! }
  include ( $module_root_path . "includes/act_header." . $phpEx );
  
--- 369,375 ----
  		"L_HIGHSCORES_TITLE" => $lang['game_highscores'], 
  		) ); 
+ //		
  // Generate page
! //
  include ( $module_root_path . "includes/act_header." . $phpEx );
  
***************
*** 419,427 ****
  
  include ( $module_root_path . "includes/act_footer." . $phpEx );
- 
- if ( !$is_block )
- {
- 	include( $mx_root_path . 'includes/page_tail.' . $phpEx );
- }
- 
  ?>
\ No newline at end of file
--- 377,379 ----

[mxbb-commits] core/modules/mx_coreblocks mx_announce.php,1.16,1.17 mx_forum.php,1.9,1.10 mx_google.php,1.7,1.8 mx_includex.php,1.6,1.7 mx_language.php,1.12,1.13 mx_login.php,1.8,1.9 mx_online.php,1.10,1.11 mx_poll.php,1.23,1.24 mx_site_log.php,1.4,1.5 mx_theme.php,1.12,1.13

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_announce.php mx_forum.php mx_google.php mx_includex.php 
	mx_language.php mx_login.php mx_online.php mx_poll.php 
	mx_site_log.php mx_theme.php 
Log Message:
Updated all core blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: mx_poll.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_poll.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mx_poll.php	1 Oct 2005 14:10:45 -0000	1.23
--- mx_poll.php	23 Oct 2005 18:48:21 -0000	1.24
***************
*** 19,23 ****
   */
  
! if( !defined('IN_PORTAL') )
  {
  	die("Hacking attempt");
--- 19,23 ----
   */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");
***************
*** 31,38 ****
  // --------------------------------------------------------------------------------
  
! $block_config = read_block_config($block_id);
! $title = $block_config[$block_id]['block_title'];
! $topic_id = $block_config[$block_id]['Poll_Display']['parameter_value'];
! $forum_lst_poll = $block_config[$block_id]['poll_forum']['parameter_value'];
  
  $auth_data_sql_poll = get_auth_forum();
--- 31,42 ----
  // --------------------------------------------------------------------------------
  
! //
! // Read Block Settings
! //
! $title = $mx_block->block_info['block_title'];
! $message = $mx_block->get_parameters( 'Text' );
! 
! $topic_id = $mx_block->get_parameters( 'Poll_Display' );
! $forum_lst_poll = $mx_block->get_parameters( 'poll_forum' );
  
  $auth_data_sql_poll = get_auth_forum();

Index: mx_forum.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_forum.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mx_forum.php	1 Oct 2005 14:10:45 -0000	1.9
--- mx_forum.php	23 Oct 2005 18:48:21 -0000	1.10
***************
*** 19,34 ****
   */
  
! if ( !defined('IN_PORTAL') )
  {
! 	define('IN_PORTAL', 1);
! 	$mx_root_path = '../../';
! 
! 	$include_page_tail = 1;
! 
! 	include($mx_root_path . 'extension.inc');
! 	include($mx_root_path . 'common.' . $phpEx);
! 
! 	$userdata = session_pagestart($user_ip, PAGE_FORUM);
! 	mx_init_userprefs($userdata); 
  }
  
--- 19,25 ----
   */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
! 	die("Hacking attempt");
  }
  

Index: mx_online.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mx_online.php	1 Oct 2005 14:10:45 -0000	1.10
--- mx_online.php	23 Oct 2005 18:48:21 -0000	1.11
***************
*** 19,28 ****
   */
  
! if( !defined('IN_PORTAL') )
  {
  	die("Hacking attempt");
  }
  
- 
  // ================================================================================
  // The following code is backported from includes/page_header.php (phpBB 2.0.13)
--- 19,27 ----
   */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");
  }
  
  // ================================================================================
  // The following code is backported from includes/page_header.php (phpBB 2.0.13)

Index: mx_login.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_login.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mx_login.php	1 Oct 2005 14:10:45 -0000	1.8
--- mx_login.php	23 Oct 2005 18:48:21 -0000	1.9
***************
*** 19,23 ****
   */
  
! if ( !defined('IN_PORTAL') )
  {
  	die("Hacking attempt");
--- 19,23 ----
   */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");

Index: mx_language.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_language.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mx_language.php	1 Oct 2005 14:10:45 -0000	1.12
--- mx_language.php	23 Oct 2005 18:48:21 -0000	1.13
***************
*** 19,23 ****
   */
  
! if ( !defined('IN_PORTAL') )
  {
  	die("Hacking attempt");
--- 19,23 ----
   */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");

Index: mx_google.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_google.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mx_google.php	1 Oct 2005 14:10:45 -0000	1.7
--- mx_google.php	23 Oct 2005 18:48:21 -0000	1.8
***************
*** 19,23 ****
   */
   
! if ( !defined('IN_PORTAL') )
  {
  	die("Hacking attempt");
--- 19,23 ----
   */
   
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");

Index: mx_site_log.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mx_site_log.php	1 Oct 2005 14:10:45 -0000	1.4
--- mx_site_log.php	23 Oct 2005 18:48:21 -0000	1.5
***************
*** 18,24 ****
   *    (at your option) any later version.
   */
   
! $block_config = read_block_config( $block_id );
! $title = $block_config[$block_id]['block_title'];
  
  $block_size = ( !empty( $block_size ) ? $block_size : '100%' );
--- 18,32 ----
   *    (at your option) any later version.
   */
+ 
+ if( !defined('IN_PORTAL') || !is_object($mx_block))
+ {
+ 	die("Hacking attempt");
+ }
   
! //
! // Read Block Settings
! //
! $title = $mx_block->block_info['block_title'];
! $message = $mx_block->get_parameters( 'Text' );
  
  $block_size = ( !empty( $block_size ) ? $block_size : '100%' );
***************
*** 28,33 ****
  // Read block Configuration
  
! $log_numberOfEvents = $block_config[$block_id]['numOfEvents']['parameter_value'] > 0 ? intval( $block_config[$block_id]['numOfEvents']['parameter_value']) : '5';
! $log_filter_time = $block_config[$block_id]['log_filter_date']['parameter_value']; // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year, 
  
  $log_start = ( isset( $HTTP_GET_VARS['log_start'] ) ) ? intval( $HTTP_GET_VARS['log_start'] ) : 0;
--- 36,41 ----
  // Read block Configuration
  
! $log_numberOfEvents = $mx_block->get_parameters( 'numOfEvents' ) > 0 ? intval( $mx_block->get_parameters( 'numOfEvents' ) ) : '5';
! $log_filter_time = $mx_block->get_parameters( 'log_filter_date' ); // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year, 
  
  $log_start = ( isset( $HTTP_GET_VARS['log_start'] ) ) ? intval( $HTTP_GET_VARS['log_start'] ) : 0;

Index: mx_includex.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mx_includex.php	1 Oct 2005 14:10:45 -0000	1.6
--- mx_includex.php	23 Oct 2005 18:48:21 -0000	1.7
***************
*** 19,42 ****
   */
   
! 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')
--- 19,45 ----
   */
   
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");
  }
  
! //
! // Read Block Settings
! //
! $title = $mx_block->block_info['block_title'];
  
  $select_row = array('x_listen', 'x_iframe', 'x_textfile', 'x_multimedia', 'x_pic', 'x_format');
  
! $iframe_mode = $select_row[$mx_block->get_parameters( 'x_mode' )];
  
  $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'] : $mx_block->get_parameters( 'x_1' ) );
! $x_2 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_2']) ? $HTTP_GET_VARS['x_2'] : $mx_block->get_parameters( 'x_2' ) );
! $x_3 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_3']) ? $HTTP_GET_VARS['x_3'] : $mx_block->get_parameters( 'x_3' ) );
  
+ //
  // Start output of page
! //
  $template->set_filenames(array(
  	'includex_block' => 'mx_includex.tpl')

Index: mx_announce.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_announce.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mx_announce.php	1 Oct 2005 14:10:45 -0000	1.16
--- mx_announce.php	23 Oct 2005 18:48:20 -0000	1.17
***************
*** 19,39 ****
   */
  
  //
! // Read block Configuration
  //
! $block_config = read_block_config($block_id);
! $title = $block_config[$block_id]['block_title'];
  
! $announce_nbr_display		= $block_config[$block_id]['announce_nbr_display']['parameter_value'];
! $announce_nbr_days			= $block_config[$block_id]['announce_nbr_days']['parameter_value'];
! $announce_display_global	= $block_config[$block_id]['announce_display_global']['parameter_value'];
! $announce_display			= $block_config[$block_id]['announce_display']['parameter_value'];
! $announce_display_sticky	= $block_config[$block_id]['announce_display_sticky']['parameter_value'];
! $announce_display_normal	= $block_config[$block_id]['announce_display_normal']['parameter_value'];
! $announce_img_global		= $block_config[$block_id]['announce_img_global']['parameter_value'];
! $announce_img				= $block_config[$block_id]['announce_img']['parameter_value'];
! $announce_img_sticky		= $block_config[$block_id]['announce_img_sticky']['parameter_value'];
! $announce_img_normal		= $block_config[$block_id]['announce_img_normal']['parameter_value'];
! $announce_forum				= $block_config[$block_id]['announce_forum']['parameter_value'];
  
  if ( empty($announce_nbr_display) ) $announce_nbr_display = 10;
--- 19,43 ----
   */
  
+ if( !defined('IN_PORTAL') || !is_object($mx_block))
+ {
+ 	die("Hacking attempt");
+ }
+  
  //
! // Read Block Settings
  //
! $title = $mx_block->block_info['block_title'];
  
! $announce_nbr_display		= $mx_block->get_parameters( 'announce_nbr_display' );
! $announce_nbr_days			= $mx_block->get_parameters( 'announce_nbr_days' );
! $announce_display_global	= $mx_block->get_parameters( 'announce_display_global' );
! $announce_display			= $mx_block->get_parameters( 'announce_display' );
! $announce_display_sticky	= $mx_block->get_parameters( 'announce_display_sticky' );
! $announce_display_normal	= $mx_block->get_parameters( 'announce_display_normal' );
! $announce_img_global		= $mx_block->get_parameters( 'announce_img_global' );
! $announce_img				= $mx_block->get_parameters( 'announce_img' );
! $announce_img_sticky		= $mx_block->get_parameters( 'announce_img_sticky' );
! $announce_img_normal		= $mx_block->get_parameters( 'announce_img_normal' );
! $announce_forum				= $mx_block->get_parameters( 'announce_forum' );
  
  if ( empty($announce_nbr_display) ) $announce_nbr_display = 10;

Index: mx_theme.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_theme.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mx_theme.php	1 Oct 2005 14:10:45 -0000	1.12
--- mx_theme.php	23 Oct 2005 18:48:21 -0000	1.13
***************
*** 19,23 ****
   */
  
! if ( !defined('IN_PORTAL') )
  {
  	die("Hacking attempt");
--- 19,23 ----
   */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");

[mxbb-commits] core/modules/mx_textblocks mx_textblock_bbcode.php,1.10,1.11 mx_textblock_blog.php,1.9,1.10 mx_textblock_html.php,1.9,1.10 mx_textblock_multi.php,1.11,1.12

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_textblock_bbcode.php mx_textblock_blog.php 
	mx_textblock_html.php mx_textblock_multi.php 
Log Message:
Updated all core blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: mx_textblock_html.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_html.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mx_textblock_html.php	1 Oct 2005 14:10:46 -0000	1.9
--- mx_textblock_html.php	23 Oct 2005 18:48:21 -0000	1.10
***************
*** 19,34 ****
   */
  
! if( !defined('IN_PORTAL') )
  {
  	die("Hacking attempt");
  }
  
! 
! $block_config = read_block_config($block_id);
! 
! $title = $block_config[$block_id]['block_title'];
! $message = $block_config[$block_id]['Html']['parameter_value'];
! 
! //$message = str_replace("\n", "\n<br />\n", $message);
  
  //
--- 19,32 ----
   */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");
  }
  
! //
! // Read Block Settings
! //
! $title = $mx_block->block_info['block_title'];
! $message = $mx_block->get_parameters( 'Html' );
  
  //

Index: mx_textblock_multi.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mx_textblock_multi.php	1 Oct 2005 14:10:46 -0000	1.11
--- mx_textblock_multi.php	23 Oct 2005 18:48:21 -0000	1.12
***************
*** 19,41 ****
   */
  
! if( !defined('IN_PORTAL') )
  {
  	die("Hacking attempt");
  }
  
  
! $block_config = read_block_config($block_id);
! $title = $block_config[$block_id]['block_title'];
! 
! $message = $block_config[$block_id]['Text']['parameter_value'];
! 
! $block_style = $block_config[$block_id]['block_style']['parameter_value'];
! $text_style = $block_config[$block_id]['text_style']['parameter_value'];
! $title_style = $block_config[$block_id]['title_style']['parameter_value'];
! $show_title = $block_config[$block_id]['show_title']['parameter_value'];
  
! $allow_bbcode = $block_config[$block_id]['allow_bbcode']['parameter_value'] == 'TRUE';
! $allow_html = $block_config[$block_id]['allow_html']['parameter_value'] == 'TRUE';
! $allow_smilies = $block_config[$block_id]['allow_smilies']['parameter_value'] == 'TRUE';
  
  // **********************************************************************
--- 19,41 ----
   */
  
! if( !defined('IN_PORTAL') || !is_object($mx_block) )
  {
  	die("Hacking attempt");
  }
  
+ //
+ // Read Block Settings
+ //
+ $title = $mx_block->block_info['block_title'];
+ $message = $mx_block->get_parameters( 'Text' );
  
! $block_style = $mx_block->get_parameters( 'block_style' );
! $text_style = $mx_block->get_parameters( 'text_style' );
! $title_style = $mx_block->get_parameters( 'title_style' );
! $show_title = $mx_block->get_parameters( 'show_title' );
  
! $allow_bbcode = $mx_block->get_parameters( 'allow_bbcode' ) == 'TRUE';
! $allow_html = $mx_block->get_parameters( 'allow_html' ) == 'TRUE';
! $allow_smilies = $mx_block->get_parameters( 'allow_smilies' ) == 'TRUE';
  
  // **********************************************************************
***************
*** 78,82 ****
  if( $allow_bbcode )
  {
! 	$bbcode_uid = $block_config[$block_id]['Text']['parameter_opt'];
  	$message = mx_decode($message, $bbcode_uid, $allow_smilies, $allow_bbcode);
  }
--- 78,82 ----
  if( $allow_bbcode )
  {
! 	$bbcode_uid = $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS );
  	$message = mx_decode($message, $bbcode_uid, $allow_smilies, $allow_bbcode);
  }

Index: mx_textblock_blog.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_blog.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mx_textblock_blog.php	1 Oct 2005 14:10:46 -0000	1.9
--- mx_textblock_blog.php	23 Oct 2005 18:48:21 -0000	1.10
***************
*** 19,22 ****
--- 19,24 ----
   */
   
+ // NOTE: This script is NOT updated for mxBB 2.8
+  
  if( !defined('IN_PORTAL') )
  {
***************
*** 50,57 ****
  $blog_id = $block_config[$block_id]['blog_id']['parameter_value'];
  
- // $block_style = $block_config[$block_id][block_style]['parameter_value'];
- // $text_style = $block_config[$block_id][text_style]['parameter_value'];
- // $title_style = $block_config[$block_id][title_style]['parameter_value'];
- // $show_title = $block_config[$block_id][show_title]['parameter_value'];
  // **********************************************************************
  // Read language definition
--- 52,55 ----

Index: mx_textblock_bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_bbcode.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mx_textblock_bbcode.php	1 Oct 2005 14:10:46 -0000	1.10
--- mx_textblock_bbcode.php	23 Oct 2005 18:48:21 -0000	1.11
***************
*** 18,22 ****
   *    (at your option) any later version.
   */
! if( !defined('IN_PORTAL') )
  {
  	die("Hacking attempt");
--- 18,23 ----
   *    (at your option) any later version.
   */
!  
! if( !defined('IN_PORTAL') || !is_object($mx_block))
  {
  	die("Hacking attempt");
***************
*** 24,33 ****
  
  //
! // Read block Configuration
  //
! $block_config = read_block_config($block_id);
! 
! $title = $block_config[$block_id]['block_title'];
! $message = $block_config[$block_id][Text]['parameter_value'];
  
  $bbcode_on = $board_config['allow_bbcode'] ? true : false;
--- 25,32 ----
  
  //
! // Read Block Settings
  //
! $title = $mx_block->block_info['block_title'];
! $message = $mx_block->get_parameters( 'Text' );
  
  $bbcode_on = $board_config['allow_bbcode'] ? true : false;
***************
*** 42,46 ****
  if( $bbcode_on )
  {
! 	$bbcode_uid = $block_config[$block_id]['Text']['parameter_opt'];
  	$message = mx_decode($message, $bbcode_uid, $smilies_on, $bbcode_on);
  }
--- 41,45 ----
  if( $bbcode_on )
  {
! 	$bbcode_uid = $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS );
  	$message = mx_decode($message, $bbcode_uid, $smilies_on, $bbcode_on);
  }

[mxbb-commits] core/modules/mx_navmenu mx_menu_nav.php,1.4,1.5

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_menu_nav.php 
Log Message:
Updated all core blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mx_menu_nav.php	12 Oct 2005 15:37:32 -0000	1.4
--- mx_menu_nav.php	23 Oct 2005 18:48:21 -0000	1.5
***************
*** 20,28 ****
  
  //
! // Read block settings
  //
! $block_config = read_block_config($block_id);
! $title = $block_config[$block_id]['block_title'];
! $b_description = $block_config[$block_id]['block_desc'];
  
  //
--- 20,27 ----
  
  //
! // Read Block Settings
  //
! $title = $mx_block->block_info['block_title'];
! $b_description = $mx_block->block_info['block_desc'];
  
  //
***************
*** 33,37 ****
  for( $i = 0; $i < count($config_name); $i++ )
  {
! 	$config_value = $block_config[$block_id][$config_name[$i]]['parameter_value'];
  	$mx_menu_config[$config_name[$i]] = $config_value;
  }
--- 32,36 ----
  for( $i = 0; $i < count($config_name); $i++ )
  {
! 	$config_value = $mx_block->get_parameters( $config_name[$i] );
  	$mx_menu_config[$config_name[$i]] = $config_value;
  }

[mxbb-commits] core/modules/mx_textblocks/admin mx_module_defs.php,1.8,1.9

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21549/modules/mx_textblocks/admin

Modified Files:
	mx_module_defs.php 
Log Message:
Updated all core blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mx_module_defs.php	22 Oct 2005 10:51:03 -0000	1.8
--- mx_module_defs.php	23 Oct 2005 18:48:21 -0000	1.9
***************
*** 104,110 ****
--- 104,112 ----
  		//
  		mx_remove_search_post($block_id);
+ 		
  		$block_config_temp = $mx_cache->read( $block_id, MX_CACHE_BLOCK_TYPE );
  		$block_info_temp = $block_config_temp[$block_id]['block_info'];		
  		$block_title = $block_info_temp['block_title'];		
+ 		
  		mx_add_search_words('single', $block_id, $parameter_value, $block_title);
  		

[mxbb-commits] core/modules/mx_statistics mx_statistics.php,1.11,1.12

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_statistics.php 
Log Message:
Updated all core blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: mx_statistics.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_statistics/mx_statistics.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mx_statistics.php	1 Oct 2005 14:10:46 -0000	1.11
--- mx_statistics.php	23 Oct 2005 18:48:21 -0000	1.12
***************
*** 39,47 ****
  {
  	//
! 	// Read block Configuration
  	//
! 	$block_config = read_block_config($block_id);
! 
! 	$title = $block_config[$block_id]['block_title'];
  
  	$is_block = true;
--- 39,45 ----
  {
  	//
! 	// Read Block Settings
  	//
! 	$title = $mx_block->block_info['block_title'];
  
  	$is_block = true;

[mxbb-commits] core/modules/mx_last_msg mx_last_msg.php,1.14,1.15

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_last_msg.php 
Log Message:
Updated all core blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: mx_last_msg.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_last_msg/mx_last_msg.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mx_last_msg.php	1 Oct 2005 14:10:45 -0000	1.14
--- mx_last_msg.php	23 Oct 2005 18:48:21 -0000	1.15
***************
*** 26,33 ****
  
  //
! // Read block Configuration
  //
! $block_config = read_block_config($block_id);
! $title = $block_config[$block_id]['block_title'];
  
  $template->set_filenames(array(
--- 26,32 ----
  
  //
! // Read Block Settings
  //
! $title = $mx_block->block_info['block_title'];
  
  $template->set_filenames(array(
***************
*** 38,59 ****
  // Read block Configuration
  //
! $PostNumber = $block_config[$block_id]['Last_Msg_Number_Title']['parameter_value'];
! $display_date = $block_config[$block_id]['Last_Msg_Display_Date']['parameter_value'];
! $nb_characteres = $block_config[$block_id]['Last_Msg_Title_Length']['parameter_value'];
! $target = $block_config[$block_id]['Last_Msg_Target']['parameter_value'];
! $align = $block_config[$block_id]['Last_Msg_Align']['parameter_value'];
! $display_forum = $block_config[$block_id]['Last_Msg_Display_Forum']['parameter_value'];
! $forum_lst_msg = $block_config[$block_id]['Last_Msg_forum']['parameter_value'];
  
  if( empty($PostNumber) ) $PostNumber = 5;
  
! $display_author = $block_config[$block_id]['Last_Msg_Display_Author']['parameter_value'];
! $display_last_author = $block_config[$block_id]['Last_Msg_Display_Last_Author']['parameter_value'];
! $display_icon_view = $block_config[$block_id]['Last_Msg_Display_Icon_View']['parameter_value'];
  
  //
  // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year,
  //
! $msg_filter_time = $block_config[$block_id]['msg_filter_date']['parameter_value'];
  
  //
--- 37,58 ----
  // Read block Configuration
  //
! $PostNumber = $mx_block->get_parameters( 'Last_Msg_Number_Title' );
! $display_date = $mx_block->get_parameters( 'Last_Msg_Display_Date' );
! $nb_characteres = $mx_block->get_parameters( 'Last_Msg_Title_Length' );
! $target = $mx_block->get_parameters( 'Last_Msg_Target' );
! $align = $mx_block->get_parameters( 'Last_Msg_Align' );
! $display_forum = $mx_block->get_parameters( 'Last_Msg_Display_Forum' );
! $forum_lst_msg = $mx_block->get_parameters( 'Last_Msg_forum' );
  
  if( empty($PostNumber) ) $PostNumber = 5;
  
! $display_author = $mx_block->get_parameters( 'Last_Msg_Display_Author' );
! $display_last_author = $mx_block->get_parameters( 'Last_Msg_Display_Last_Author' );
! $display_icon_view = $mx_block->get_parameters( 'Last_Msg_Display_Icon_View' );
  
  //
  // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year,
  //
! $msg_filter_time = $mx_block->get_parameters( 'msg_filter_date' );
  
  //

[mxbb-commits] core/modules/mx_navmenu/admin mx_module_defs.php,1.10,1.11

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21549/modules/mx_navmenu/admin

Modified Files:
	mx_module_defs.php 
Log Message:
Updated all core blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mx_module_defs.php	22 Oct 2005 10:51:03 -0000	1.10
--- mx_module_defs.php	23 Oct 2005 18:48:21 -0000	1.11
***************
*** 111,130 ****
  		$link_target_options = array("Default", "New browser", "IncludeX Block");
  		
- 		/*
- 		$menu_display_mode_options = array();
- 		$menu_display_mode_options = array("Vertical", "Horizontal");
- 		
- 		$menu_page_sync_options = array();
- 		$menu_page_sync_options = array("No", "Highlight_current_page");
- 		
- 		$config_name = array('menu_display_mode', 'menu_page_sync');
- 		
- 		for( $i = 0; $i < count($config_name); $i++ )
- 		{
- 			$config_value = $block_config[$block_id][$config_name[$i]]['parameter_value'];
- 			$mx_menu_config[$config_name[$i]] = $config_value;
- 		}
- 		*/
- 		
  		//
  		// Mode setting
--- 111,114 ----
***************
*** 414,419 ****
  			$cat_target = $link_target_options[$category_rows[$cat_count]['cat_target']];
  		
- 			//$pagelist = get_list_opt("cat_url_sel", PAGE_TABLE, 'page_id', 'page_name', $cat_url, true);
- 					
  			$link_target_list = '<select name="cat_target_sel">';
  			for( $j = 0; $j < count($link_target_options); $j++ )
--- 398,401 ----
***************
*** 498,502 ****
  				'E_CAT_DESC' 				=> $cat_desc,
  				'S_CAT_SHOW_CAT' 			=> $show_cat_select,
- 				//'S_CAT_PAGE_LIST' 			=> $pagelist,
  				'S_CAT_LINK_TARGET_LIST' 	=> $link_target_list,				
  		
--- 480,483 ----
***************
*** 509,514 ****
  				//
  				'NAME' => $name,
- 				//'L_MENU_DELETE' => $lang['Menu_delete'],
- 				//'L_MENU_DELETE_EXPLAIN' => $lang['Menu_delete_explain'],
  				'L_MOVE_CONTENTS' => $lang['Move_contents'],
  				'L_MENU_NAME' => $lang['Menu_name'],
--- 490,493 ----

[mxbb-commits] core/includes mx_functions_admincp.php,1.11,1.12 mx_functions_core.php,1.14,1.15

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions_admincp.php mx_functions_core.php 
Log Message:
Updated all core blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mx_functions_core.php	22 Oct 2005 23:07:00 -0000	1.14
--- mx_functions_core.php	23 Oct 2005 18:48:20 -0000	1.15
***************
*** 949,952 ****
--- 949,954 ----
  	function get_parameters($key = MX_GET_ALL_PARS, $mode = MX_GET_PAR_VALUE)
  	{
+ 		$block_config_temp = '';
+ 		
  		if ($key == MX_GET_ALL_PARS)
  		{
***************
*** 957,961 ****
  		if ($mode == MX_GET_PAR_OPTIONS)
  		{
! 			$block_config_temp = $this->block_parameters[$key]['parameter_option'];
  			return $block_config_temp;
  		}		
--- 959,963 ----
  		if ($mode == MX_GET_PAR_OPTIONS)
  		{
! 			$block_config_temp = $this->block_parameters[$key]['parameter_opt'];
  			return $block_config_temp;
  		}		
***************
*** 1927,1930 ****
--- 1929,1934 ----
  // -------------------------------------------------------------------------------------------------------------
  // For compatibility with old block calls
+ // NOTE: This usage is NOT preferred, and should only be used on rare occasions when the $mx_block object is unavailable
+ // This wrapper function calls the cache (if enabled) or db directly to get parameter data
  //
  
***************
*** 1943,1946 ****
--- 1947,1955 ----
  }
  
+ //
+ // -------------------------------------------------------------------------------------------------------------
+ // For compatibility with old/special scripts
+ // In reality only used in mx_install.php until we have an alternative ;)
+ //
  function update_session_cache( $id = '' )
  {

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mx_functions_admincp.php	22 Oct 2005 10:51:02 -0000	1.11
--- mx_functions_admincp.php	23 Oct 2005 18:48:20 -0000	1.12
***************
*** 1297,1305 ****
  				}
  				
- 				//
- 				// Update cache
- 				//
- 				// update_session_cache( $id );
- 				
  				if ( !MX_ADMIN_DEBUG )
  				{
--- 1297,1300 ----

[mxbb-commits] core/install mx_install.php,1.52,1.53

[Andrew N. \(MHobbit\) <men...@us...>]

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

Modified Files:
	mx_install.php 
Log Message:
Fixed a dead link(s)... we need to reorganize the site docs sometime though.

Index: mx_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/mx_install.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** mx_install.php	22 Oct 2005 13:03:43 -0000	1.52
--- mx_install.php	23 Oct 2005 18:37:06 -0000	1.53
***************
*** 61,67 ****
  //
  define('U_RELEASE_NOTES', 'http://www.mx-system.com/forum/viewtopic.php?t=1224');
! define('U_WELCOME_PACK', 'http://www.mx-system.com/forum/viewtopic.php?t=6445');
  define('U_ONLINE_FAQ', 'http://www.mx-system.com/index.php?page=117');
! define('U_ONLINE_SUPPORT', 'http://www.mx-system.com/');
  define('U_TERMS_OF_USE', 'http://www.mx-system.com/index.php?page=126&dynamic_block=133');
  
--- 61,67 ----
  //
  define('U_RELEASE_NOTES', 'http://www.mx-system.com/forum/viewtopic.php?t=1224');
! define('U_WELCOME_PACK', 'http://www.mx-system.com/index.php?page=136');
  define('U_ONLINE_FAQ', 'http://www.mx-system.com/index.php?page=117');
! define('U_ONLINE_SUPPORT', 'http://www.mx-system.com/index.php?page=2');
  define('U_TERMS_OF_USE', 'http://www.mx-system.com/index.php?page=126&dynamic_block=133');
  

[mxbb-commits] core/templates/subSilver/admin index_body.tpl,1.3,1.4

[Andrew N. \(MHobbit\) <men...@us...>]

Update of /cvsroot/mxbb/core/templates/subSilver/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1796/templates/subSilver/admin

Modified Files:
	index_body.tpl 
Log Message:
Forgot to do this last night...

Index: index_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/index_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index_body.tpl	10 Sep 2005 22:08:24 -0000	1.3
--- index_body.tpl	23 Oct 2005 17:11:50 -0000	1.4
***************
*** 74,78 ****
  <h1>{L_VERSION_INFORMATION}</h1>
  
! {VERSION_INFO}
  
  <br clear="all" />
\ No newline at end of file
--- 74,78 ----
  <h1>{L_VERSION_INFORMATION}</h1>
  
! {PHPBB_VERSION_INFO}
  
  <br clear="all" />
\ No newline at end of file

[mxbb-commits] core/modules/mx_rebuild_search_tables Reguild Search Tables.pak,1.3,NONE

[Jon O. <jon...@us...>]

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

Removed Files:
	Reguild Search Tables.pak 
Log Message:
removed old file

--- Reguild Search Tables.pak DELETED ---

[mxbb-commits] core/language/lang_english lang_admin.php,1.48,1.49

[Andrew N. \(MHobbit\) <men...@us...>]

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

Modified Files:
	lang_admin.php 
Log Message:
I'm sooo picky... so shoot me. :-P

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** lang_admin.php	22 Oct 2005 19:55:39 -0000	1.48
--- lang_admin.php	23 Oct 2005 02:18:48 -0000	1.49
***************
*** 50,54 ****
  $lang['4_1_Integrity']				= "Integrity Checker";
  $lang['4_1_Meta']					= "META tags";
! $lang['4_1_PHPinfo']				= "PHPinfo()";
  
  //
--- 50,54 ----
  $lang['4_1_Integrity']				= "Integrity Checker";
  $lang['4_1_Meta']					= "META tags";
! $lang['4_1_PHPinfo']				= "PHPInfo()";
  
  //

[mxbb-commits] core/admin index.php,1.14,1.15

[Andrew N. \(MHobbit\) <men...@us...>]

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

Modified Files:
	index.php 
Log Message:
Only altered the code within the phpBB version check block... preparing for the mxBB version check

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** index.php	22 Oct 2005 23:07:00 -0000	1.14
--- index.php	23 Oct 2005 02:17:29 -0000	1.15
***************
*** 761,771 ****
  		);
  	}
! 
! 	// Check for new version
! 	$current_version = explode('.', '2' . $board_config['version']);
! 	$minor_revision = (int) $current_version[2];
  
  	$errno = 0;
! 	$errstr = $version_info = '';
  
  	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr))
--- 761,771 ----
  		);
  	}
! 	
! 	// Check for new phpBB version
! 	$current_phpbb_version = explode('.', '2' . $board_config['version']);
! 	$minor_phpbb_revision = (int) $current_phpbb_version[2];
  
  	$errno = 0;
! 	$errstr = $phpbb_version_info = '';
  
  	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr))
***************
*** 780,784 ****
  			if ($get_info)
  			{
! 				$version_info .= @fread($fsock, 1024);
  			}
  			else
--- 780,784 ----
  			if ($get_info)
  			{
! 				$phpbb_version_info .= @fread($fsock, 1024);
  			}
  			else
***************
*** 792,808 ****
  		@fclose($fsock);
  
! 		$version_info = explode("\n", $version_info);
! 		$latest_head_revision = (int) $version_info[0];
! 		$latest_minor_revision = (int) $version_info[2];
! 		$latest_version = (int) $version_info[0] . '.' . (int) $version_info[1] . '.' . (int) $version_info[2];
  
! 		if ($latest_head_revision == 2 && $minor_revision == $latest_minor_revision)
  		{
! 			$version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>';
  		}
  		else
  		{
! 			$version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
! 			$version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';
  		}
  	}
--- 792,808 ----
  		@fclose($fsock);
  
! 		$phpbb_version_info = explode("\n", $phpbb_version_info);
! 		$latest_phpbb_head_revision = (int) $phpbb_version_info[0];
! 		$latest_phpbb_minor_revision = (int) $phpbb_version_info[2];
! 		$latest_phpbb_version = (int) $phpbb_version_info[0] . '.' . (int) $phpbb_version_info[1] . '.' . (int) $phpbb_version_info[2];
  
! 		if ($latest_phpbb_head_revision == 2 && $minor_phpbb_revision == $latest_phpbb_minor_revision)
  		{
! 			$phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>';
  		}
  		else
  		{
! 			$phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
! 			$phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $phpbb_latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';
  		}
  	}
***************
*** 811,827 ****
  		if ($errstr)
  		{
! 			$version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
  		}
  		else
  		{
! 			$version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
  		}
  	}
  	
! 	$version_info .= '<p>' . $lang['Mailing_list_subscribe_reminder'] . '</p>';
  	
  
  	$template->assign_vars(array(
! 		'VERSION_INFO'	=> $version_info,
  		'L_VERSION_INFORMATION'	=> $lang['Version_information'])
  	);
--- 811,829 ----
  		if ($errstr)
  		{
! 			$phpbb_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
  		}
  		else
  		{
! 			$phpbb_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
  		}
  	}
  	
! 	$phpbb_version_info .= '<p>' . $lang['Mailing_list_subscribe_reminder'] . '</p>';
! 	
! 	// done with the phpBB version check for now
  	
  
  	$template->assign_vars(array(
! 		'PHPBB_VERSION_INFO'	=> $phpbb_version_info,
  		'L_VERSION_INFORMATION'	=> $lang['Version_information'])
  	);

[mxbb-commits] mx_kb db_install.php,1.32,1.33

[Andrew N. \(MHobbit\) <men...@us...>]

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

Modified Files:
	db_install.php 
Log Message:
Nothing was actually changed, just language...

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** db_install.php	1 Oct 2005 14:13:46 -0000	1.32
--- db_install.php	23 Oct 2005 02:04:18 -0000	1.33
***************
*** 239,243 ****
  echo "<br /><br />";
  echo "<table  width=\"90%\" align=\"center\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">";
! echo "<tr><th class=\"thHead\" align=\"center\">Module Installation/Upgrading/Uninstalling Information - module specific db tables</th></tr>";
  echo "<tr><td class=\"row1\"  align=\"left\"><span class=\"gen\">" . $message . "</span></td></tr>";
  echo "</table><br />";
--- 239,243 ----
  echo "<br /><br />";
  echo "<table  width=\"90%\" align=\"center\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">";
! echo "<tr><th class=\"thHead\" align=\"center\">Module Installation/Upgrading/Uninstallation Information - module specific DB tables</th></tr>";
  echo "<tr><td class=\"row1\"  align=\"left\"><span class=\"gen\">" . $message . "</span></td></tr>";
  echo "</table><br />";

[mxbb-commits] mx_kb/language/lang_english lang_main.php,1.2,1.3

[Andrew N. \(MHobbit\) <men...@us...>]

Update of /cvsroot/mxbb/mx_kb/language/lang_english
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6208/language/lang_english

Modified Files:
	lang_main.php 
Log Message:
Clean up and some fixes...

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/language/lang_english/lang_main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lang_main.php	1 Oct 2005 14:13:47 -0000	1.2
--- lang_main.php	23 Oct 2005 02:01:52 -0000	1.3
***************
*** 39,53 ****
  $lang['Edit'] = 'Edit';
  
! $lang['Article_submitted_Approve'] = 'Article Submitted Successfully.<br />An Administrator will review your article and decide whether to let user\'s view it or not.';
  $lang['Article_submitted'] = 'Article Submitted Successfully.';
  $lang['Click_return_kb'] = 'Click %sHere%s to return to the ' . $lang['KB_title'];
  $lang['Click_return_article'] = 'Click %sHere%s to return to the ' . $lang['Article'];
  
! $lang['Article_Edited_Approve'] = 'Article Edited Successfully.<br />It need to be approved again before user\'s can view it.';
  $lang['Article_Edited'] = 'Article Edited Successfully.';
  $lang['Edit_article'] = 'Edit Article';
  
  $lang['KB_title'] = 'Knowledge Base';
! $lang['KB_art_description'] = 'Here you can approve articles so users can view them or you can delete articles.';
  $lang['Art_man'] = 'Article Manager';
  $lang['Cat_man'] = 'Category Manager';
--- 39,53 ----
  $lang['Edit'] = 'Edit';
  
! $lang['Article_submitted_Approve'] = 'Article Submitted Successfully.<br />An Administrator will review your article and decide whether to let users view it or not.';
  $lang['Article_submitted'] = 'Article Submitted Successfully.';
  $lang['Click_return_kb'] = 'Click %sHere%s to return to the ' . $lang['KB_title'];
  $lang['Click_return_article'] = 'Click %sHere%s to return to the ' . $lang['Article'];
  
! $lang['Article_Edited_Approve'] = 'Article Edited Successfully.<br />It needs to be approved again before users can view it.';
  $lang['Article_Edited'] = 'Article Edited Successfully.';
  $lang['Edit_article'] = 'Edit Article';
  
  $lang['KB_title'] = 'Knowledge Base';
! $lang['KB_art_description'] = 'Here you can approve articles so users can view them, or you can delete articles.';
  $lang['Art_man'] = 'Article Manager';
  $lang['Cat_man'] = 'Category Manager';
***************
*** 62,66 ****
  $lang['Un_approve'] = 'Un-Approve';
  $lang['Article_approved'] = 'Article is now Approved.';
! $lang['Article_unapproved'] = 'Article is now Not Approved.';
  
  //delete
--- 62,66 ----
  $lang['Un_approve'] = 'Un-Approve';
  $lang['Article_approved'] = 'Article is now Approved.';
! $lang['Article_unapproved'] = 'Article is now Unapproved.';
  
  //delete
***************
*** 106,119 ****
  $lang['Admin_id_explain'] = 'This is the user id number that PM notifications will be sent to.';
  $lang['Approve_new_name'] = 'Approve new Articles';
! $lang['Approve_new_explain'] = 'Change whether <b />new</b /> articles need to be approved or not';
  $lang['Approve_edit_name'] = 'Approve Edited Articles';
! $lang['Approve_edit_explain'] = 'Change whether <b />edited</b /> articles need to be approved or not';
! $lang['Allow_anon_name'] = 'Allow anonymous posting of Articles'; 
! $lang['Allow_anon_explain'] = 'Change whether <b />new</b /> articles can be submitted anonymously'; 
  $lang['Del_topic'] = 'Delete Topic';
  $lang['Del_topic_explain'] = 'When you delete an article, do you want its comments topic to be deleted also?';
  
  $lang['Use_comments'] = 'Comments';
! $lang['Use_comments_explain'] = 'Enable comments for articles, to be inserted in the phpbb forum';
  $lang['Use_ratings'] = 'Ratings';
  $lang['Use_ratings_explain'] = 'Enable ratings for articles';
--- 106,119 ----
  $lang['Admin_id_explain'] = 'This is the user id number that PM notifications will be sent to.';
  $lang['Approve_new_name'] = 'Approve new Articles';
! $lang['Approve_new_explain'] = 'Change whether <b>new</b> articles need to be approved or not';
  $lang['Approve_edit_name'] = 'Approve Edited Articles';
! $lang['Approve_edit_explain'] = 'Change whether <b>edited</b> articles need to be approved or not';
! $lang['Allow_anon_name'] = 'Allow anonymous posting of articles'; 
! $lang['Allow_anon_explain'] = 'Change whether <b>new</b> articles can be submitted anonymously'; 
  $lang['Del_topic'] = 'Delete Topic';
  $lang['Del_topic_explain'] = 'When you delete an article, do you want its comments topic to be deleted also?';
  
  $lang['Use_comments'] = 'Comments';
! $lang['Use_comments_explain'] = 'Enable comments for articles, to be inserted in the forum';
  $lang['Use_ratings'] = 'Ratings';
  $lang['Use_ratings_explain'] = 'Enable ratings for articles';
***************
*** 127,131 ****
  //
  $lang['KB_Auth_Title'] = 'KB Permissions';
! $lang['KB_Auth_Explain'] = 'Here you can choose which usergroup(s) can be the moderators for each kb category or just has the private access';
  $lang['Select_a_Category'] = 'Select a Category';
  $lang['Look_up_Category'] = 'Look up Category';
--- 127,131 ----
  //
  $lang['KB_Auth_Title'] = 'KB Permissions';
! $lang['KB_Auth_Explain'] = 'Here you can choose which usergroup(s) can be the moderators for each KB category, or just has the private access';
  $lang['Select_a_Category'] = 'Select a Category';
  $lang['Look_up_Category'] = 'Look up Category';
***************
*** 142,147 ****
  $lang['Allow_rating_explain'] = 'Users are allowed to rate articles.';
  
! $lang['Allow_anonymos_rating'] = 'Allow anonymos ratings';
! $lang['Allow_anonymos_rating_explain'] = 'If ratings is activated, allow anonymos users to add ratings to your articles';
  
  $lang['KB_config_updated'] = 'Knowledge Base Configuration Updated Successfully.';
--- 142,147 ----
  $lang['Allow_rating_explain'] = 'Users are allowed to rate articles.';
  
! $lang['Allow_anonymos_rating'] = 'Allow anonymous ratings';
! $lang['Allow_anonymos_rating_explain'] = 'If ratings are activated, allow anonymous users to add ratings to your articles';
  
  $lang['KB_config_updated'] = 'Knowledge Base Configuration Updated Successfully.';
***************
*** 204,208 ****
  //types
  $lang['Types_man'] = 'Types Manager';
! $lang['KB_types_description'] = 'Here you can add delete and edit the different article types';
  $lang['Create_type'] = 'Create new Article Type:';
  $lang['Type_created'] = 'Article Type Created Successfully.';
--- 204,208 ----
  //types
  $lang['Types_man'] = 'Types Manager';
! $lang['KB_types_description'] = 'Here you can add, delete, and/or edit the different article types';
  $lang['Create_type'] = 'Create new Article Type:';
  $lang['Type_created'] = 'Article Type Created Successfully.';
***************
*** 222,226 ****
  $lang['Pre_text_header'] = 'Article Submission Instructions Header';
  $lang['Pre_text_body'] = 'Article Submission Instructions Body';
! $lang['Pre_text_explain'] = 'This is text instructions displayed to users at the top of the submission forum.';
  
  $lang['Show'] = 'Show';
--- 222,226 ----
  $lang['Pre_text_header'] = 'Article Submission Instructions Header';
  $lang['Pre_text_body'] = 'Article Submission Instructions Body';
! $lang['Pre_text_explain'] = 'This is the instruction text displayed to users at the top of the submission forum.';
  
  $lang['Show'] = 'Show';
***************
*** 281,288 ****
  
  // Votes check
! $lang['Votes_check_ip'] = 'Validate ratings - ip'; 
! $lang['Votes_check_ip_explain'] = 'Only one vote per IP-adress is permitted.'; 
  
! $lang['Votes_check_userid'] = 'Validate ratings - user'; 
  $lang['Votes_check_userid_explain'] = 'Users may only vote once.'; 
  
--- 281,288 ----
  
  // Votes check
! $lang['Votes_check_ip'] = 'Validate ratings - IP'; 
! $lang['Votes_check_ip_explain'] = 'Only one vote per IP address is permitted.'; 
  
! $lang['Votes_check_userid'] = 'Validate ratings - User'; 
  $lang['Votes_check_userid_explain'] = 'Users may only vote once.'; 
  
***************
*** 312,316 ****
  
  $lang['News_updated_return_settings'] = "KB block configuration updated successfully.<br /><br />Click %shere%s to return to main page."; // %s's for URI params - DO NOT REMOVE
! $lang['News_update_error'] = "Couldn't update KB block configuration.<br /><br />This mod is designed for MySQL so please contact the author if you have troubles. If you can offer a translation of the SQL into other database formats, please send them to:<br />";
  
  // Custom Field
--- 312,316 ----
  
  $lang['News_updated_return_settings'] = "KB block configuration updated successfully.<br /><br />Click %shere%s to return to main page."; // %s's for URI params - DO NOT REMOVE
! $lang['News_update_error'] = "Couldn't update KB block configuration.<br /><br />This mod is designed for MySQL, so please contact the author if you have troubles. If you can offer a translation of the SQL into other database formats, please send them to:<br />";
  
  // Custom Field
***************
*** 334,338 ****
  
  $lang['Field_data'] = 'Options';
! $lang['Field_data_info'] = 'Enter the options that the user can choose from. Separate each option with a new-line (carriage return).';
  $lang['Field_regex'] = 'Regular Expression';
  $lang['Field_regex_info'] = 'You may require the input field to match a regular expression %s(PCRE)%s.';
--- 334,338 ----
  
  $lang['Field_data'] = 'Options';
! $lang['Field_data_info'] = 'Enter the options that the user can choose from. Separate each option with a newline (carriage return).';
  $lang['Field_regex'] = 'Regular Expression';
  $lang['Field_regex_info'] = 'You may require the input field to match a regular expression %s(PCRE)%s.';
***************
*** 377,392 ****
  $lang['KB_comment_prefix'] = '[ KB ] ';
  
! $lang['Wysiwyg'] = 'Use wysiwyg editor';
! $lang['Wysiwyg_explain'] = 'If enabled, the standard bbcode/html/smilies input dialog is replaced by a wysiwyg editor.';
  
! $lang['Wysiwyg_path'] = 'Path to wysiwyg software';
! $lang['Wysiwyg_path_explain'] = 'This is the path (from mxBB/phpBB root) to the wysiwyg software folder, eg \'modules/\' if you have uploaded for example tinemce in modules/tinymce.';
  
  $lang['Formatting_fixup'] = 'Fixup formatting';
! $lang['Formatting_fixup_explain'] = 'I enabled, the article text is reformatted: wordwrapping, url truncates, img resizing, some bbcode reformatting etc';
  
  $lang['Addtional_field'] = 'More information (optional)';
  
! $lang['No_cat_comments_forum_id'] = 'Comments are enabled but you have not specified the target phpBB forum category in the KB adminCP - Cateogries';
  
  // Quick Nav
--- 377,392 ----
  $lang['KB_comment_prefix'] = '[ KB ] ';
  
! $lang['Wysiwyg'] = 'Use WYSIWYG editor';
! $lang['Wysiwyg_explain'] = 'If enabled, the standard BBCode/HTML/Smilies input dialog is replaced by a WYSIWYG editor.';
  
! $lang['Wysiwyg_path'] = 'Path to WYSIWYG software';
! $lang['Wysiwyg_path_explain'] = 'This is the path (from mxBB/phpBB root) to the WYSIWYG software folder, eg \'modules/\' if you have uploaded, for example, TinyMCE in modules/tinymce.';
  
  $lang['Formatting_fixup'] = 'Fixup formatting';
! $lang['Formatting_fixup_explain'] = 'If enabled, the article text is reformatted: word wrapping, URL truncation, image resizing, some BBCode reformatting, etc.';
  
  $lang['Addtional_field'] = 'More information (optional)';
  
! $lang['No_cat_comments_forum_id'] = 'Comments are enabled but you have not specified the target phpBB forum category in the KB adminCP - Categories';
  
  // Quick Nav

[mxbb-commits] core mx_meta.inc,1.3,1.4

[Andrew N. \(MHobbit\) <men...@us...>]

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

Modified Files:
	mx_meta.inc 
Log Message:


Index: mx_meta.inc
===================================================================
RCS file: /cvsroot/mxbb/core/mx_meta.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_meta.inc	1 Oct 2005 14:10:44 -0000	1.3
--- mx_meta.inc	23 Oct 2005 00:05:38 -0000	1.4
***************
*** 19,26 ****
   */
   
!  $title       = "Your sites title";
   $author      = "Your name or your company name";
   $copyright   = "Add some copyright notice here";
!  $keywords    = "Add, all, your, keywords, in, here";
   $description = "This is the description search engines show when listing your site.";
   $langcode    = "en";
--- 19,26 ----
   */
   
!  $title       = "Your site's title";
   $author      = "Your name or your company name";
   $copyright   = "Add some copyright notice here";
!  $keywords    = "Add all your keywords in here (separate each keyword by a comma and space)";
   $description = "This is the description search engines show when listing your site.";
   $langcode    = "en";

[mxbb-commits] core/modules/mx_rebuild_search_tables Rebuild Search Tables.pak,NONE,1.1

[Andrew N. \(MHobbit\) <men...@us...>]

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

Added Files:
	Rebuild Search Tables.pak 
Log Message:


--- NEW FILE: Rebuild Search Tables.pak ---
module=+:54=+:Rebuild Search Tables=+:modules/mx_rebuild_search_tables/=+:=+:1
function=+:0=+:0=+:0=+:endoflist=+:0=+:0

[mxbb-commits] core/modules/mx_rebuild_search_tables Reguild Search Tables.pak,1.2,1.3

[Andrew N. \(MHobbit\) <men...@us...>]

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

Modified Files:
	Reguild Search Tables.pak 
Log Message:
Misspelling of "rebuild" (it was spelled "reguild") fixed... will rename the file too.

Index: Reguild Search Tables.pak
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/Reguild Search Tables.pak,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Reguild Search Tables.pak	20 Sep 2005 15:30:59 -0000	1.2
--- Reguild Search Tables.pak	22 Oct 2005 23:50:32 -0000	1.3
***************
*** 1,2 ****
! module=+:54=+:Reguild Search Tables=+:modules/mx_rebuild_search_tables/=+:=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0
--- 1,2 ----
! module=+:54=+:Rebuild Search Tables=+:modules/mx_rebuild_search_tables/=+:=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0

[mxbb-commits] core/install/schemas mysql_schema_install.sql,1.7,1.8

[Jon O. <jon...@us...>]

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

Modified Files:
	mysql_schema_install.sql 
Log Message:
updated
i forgot to add new db fields to the fresh install (i had it for the upgrade ;)

Index: mysql_schema_install.sql
===================================================================
RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mysql_schema_install.sql	9 Sep 2005 17:52:00 -0000	1.7
--- mysql_schema_install.sql	22 Oct 2005 23:18:27 -0000	1.8
***************
*** 393,396 ****
--- 393,397 ----
    `page_header` varchar(255) default 'overall_header.tpl',
    `page_graph_border` varchar(255) NOT NULL default '',
+   `ip_filter` varchar(255) NOT NULL default '',
    PRIMARY KEY  (`page_id`)
  );
***************
*** 401,408 ****
  # Dumping data for table 'mx_table_page'
  #
! INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "nav_statistics.gif", "0", "0", "0", "overall_header.tpl", "");
! INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "nav_home.gif", "0", "0", "0", "overall_header.tpl", "");
! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "nav_forum.gif", "0", "0", "0", "overall_header.tpl", "");
! INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "nav_develope.gif", "0", "0", "0", "overall_header.tpl", "");
  
  
--- 402,409 ----
  # Dumping data for table 'mx_table_page'
  #
! INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "nav_statistics.gif", "0", "0", "0", "overall_header.tpl", "", "");
! INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "nav_home.gif", "0", "0", "0", "overall_header.tpl", "", "");
! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "nav_forum.gif", "0", "0", "0", "overall_header.tpl", "", "");
! INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "nav_develope.gif", "0", "0", "0", "overall_header.tpl", "", "");
  
  
***************
*** 513,517 ****
    `top_phpbb_links` smallint(5) unsigned NOT NULL default '1',
    `mx_use_cache` smallint(5) unsigned NOT NULL default '1',
!   `portal_recached` varchar(255) binary NOT NULL default '',
    PRIMARY KEY  (`portal_id`)
  );
--- 514,519 ----
    `top_phpbb_links` smallint(5) unsigned NOT NULL default '1',
    `mx_use_cache` smallint(5) unsigned NOT NULL default '1',
!   `portal_recached` varchar(255) NOT NULL default '',
!   `mod_rewrite` varchar(255) NOT NULL default '0',
    PRIMARY KEY  (`portal_id`)
  );

[mxbb-commits] core/admin admin_mx_block_cp.php,1.6,1.7 admin_mx_module_cp.php,1.7,1.8 index.php,1.13,1.14

[Jon O. <jon...@us...>]

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

Modified Files:
	admin_mx_block_cp.php admin_mx_module_cp.php index.php 
Log Message:
adding a wrapper to get block parameters
to be used by the dev_startkit module - and the rest as soon as they are updated
minor fixes to the adminCP

Index: admin_mx_module_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** admin_mx_module_cp.php	22 Oct 2005 10:51:02 -0000	1.7
--- admin_mx_module_cp.php	22 Oct 2005 23:07:00 -0000	1.8
***************
*** 442,445 ****
--- 442,457 ----
  		$check_opt = 'checked="checked"';
  	}
+ 
+ 	// **********************************************************************
+ 	// Read language definition
+ 	// **********************************************************************
+ 	if( file_exists($mx_root_path . $module_rows[$module_count]['module_path'] . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx) )
+ 	{
+ 		include($mx_root_path . $module_rows[$module_count]['module_path'] . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
+ 	}
+ 	else if( file_exists($mx_root_path . $module_rows[$module_count]['module_path'] . 'language/lang_english/lang_admin.' . $phpEx) )
+ 	{
+ 		include($mx_root_path . $module_rows[$module_count]['module_path'] . 'language/lang_english/lang_admin.' . $phpEx);
+ 	}
  	
  	//

Index: admin_mx_block_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_mx_block_cp.php	22 Oct 2005 10:51:01 -0000	1.6
--- admin_mx_block_cp.php	22 Oct 2005 23:07:00 -0000	1.7
***************
*** 161,167 ****
  	include($mx_root_path . $mx_blockcp->module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
  }
! else if( file_exists($mx_root_path . $mx_blockcp->module_root_path . 'language/lang_english/lang_main.' . $phpEx) )
  {
! 	include($mx_root_path . $mx_blockcp->module_root_path . 'language/lang_english/lang_main.' . $phpEx);
  }
  
--- 161,167 ----
  	include($mx_root_path . $mx_blockcp->module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
  }
! else if( file_exists($mx_root_path . $mx_blockcp->module_root_path . 'language/lang_english/lang_admin.' . $phpEx) )
  {
! 	include($mx_root_path . $mx_blockcp->module_root_path . 'language/lang_english/lang_admin.' . $phpEx);
  }
  

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** index.php	22 Oct 2005 19:01:50 -0000	1.13
--- index.php	22 Oct 2005 23:07:00 -0000	1.14
***************
*** 250,254 ****
  
  	ksort($module_mx);
! 
  //+MOD: DHTML Menu for ACP
  	$menu_cat_id = 0;
--- 250,254 ----
  
  	ksort($module_mx);
! 	
  //+MOD: DHTML Menu for ACP
  	$menu_cat_id = 0;

[mxbb-commits] core/includes mx_functions_core.php,1.13,1.14

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions_core.php 
Log Message:
adding a wrapper to get block parameters
to be used by the dev_startkit module - and the rest as soon as they are updated
minor fixes to the adminCP

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mx_functions_core.php	22 Oct 2005 10:51:02 -0000	1.13
--- mx_functions_core.php	22 Oct 2005 23:07:00 -0000	1.14
***************
*** 58,61 ****
--- 58,65 ----
  define('MX_CACHE_DEBUG'		, false);	// echo lots of debug info
  
+ define('MX_GET_ALL_PARS'	, -10);		// Flag - get all parameters
+ define('MX_GET_PAR_VALUE'	, -20);		// Flag - get parameter value
+ define('MX_GET_PAR_OPTIONS'	, -30);		// Flag - get parameter option
+ 
  class mx_cache
  {
***************
*** 920,924 ****
  		//
  		$layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array() );		
! 	}				
  	
  }	// class mx_block
--- 924,967 ----
  		//
  		$layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array() );		
! 	}	
! 
! 	/********************************************************************************\
! 	| Module Parameters Api
! 	| ------------------
! 	| Core provides a rich set of parameter types. Additional block specific types are defined in module_root/admin/mx_module_defs.php.
! 	| Block parameters are accessed with the mx_block->get_parameters() method. 
! 	|
! 	| mx_block->get_parameters() Api
! 	|
! 	| Available switches: MX_GET_ALL_PARS, MX_GET_PAR_VALUE (default), MX_GET_PAR_OPTIONS
! 	|
! 	| Examples:
! 	|
! 	| $mx_block->get_parameters( MX_GET_ALL_PARS ) 
! 	| - returns an array with all parameters :: array('par_name1' => $par1_value, 'par_name2' => $par2_value,  ...)
! 	|
! 	| $mx_block->get_parameters( 'parameter_name' )
! 	| - returns value for 'parameter_name'
! 	|
! 	| $mx_block->get_parameters( 'parameter_name',  MX_GET_PAR_OPTIONS )
! 	| - returns options for 'parameter_name', eg bbcodes etc	
! 	\********************************************************************************/
! 	function get_parameters($key = MX_GET_ALL_PARS, $mode = MX_GET_PAR_VALUE)
! 	{
! 		if ($key == MX_GET_ALL_PARS)
! 		{
! 			$block_config_temp = array_merge($this->block_info, $this->block_parameters);
! 			return $block_config_temp;
! 		}
! 		
! 		if ($mode == MX_GET_PAR_OPTIONS)
! 		{
! 			$block_config_temp = $this->block_parameters[$key]['parameter_option'];
! 			return $block_config_temp;
! 		}		
! 		
! 			$block_config_temp = $this->block_parameters[$key]['parameter_value'];
! 			return $block_config_temp;
! 	}
  	
  }	// class mx_block

[mxbb-commits] mx_dev_startkit DevelopersStartkit.pak,1.1,1.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_dev_startkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv498/modules/mx_dev_startkit

Modified Files:
	DevelopersStartkit.pak 
Log Message:
updated pak

Index: DevelopersStartkit.pak
===================================================================
RCS file: /cvsroot/mxbb/mx_dev_startkit/DevelopersStartkit.pak,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DevelopersStartkit.pak	22 Oct 2005 22:42:31 -0000	1.1
--- DevelopersStartkit.pak	22 Oct 2005 22:43:04 -0000	1.2
***************
*** 2,8 ****
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
  function=+:60=+:104=+:DevelopersStartkitFunction=+:Startkit Function=+:mx_dev_startkit.php=+:
! parameter=+:104=+:349=+:startkit_test_custom=+:startkit_group_select=+:=+:
  parameter=+:104=+:348=+:startkit_test_number=+:Number=+:0=+:
! parameter=+:104=+:347=+:startkit_test_string=+:Text=+:enter a string=+:
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - DevelopersStartkitFunction=+:Demo block=+:104=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
--- 2,8 ----
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
  function=+:60=+:104=+:DevelopersStartkitFunction=+:Startkit Function=+:mx_dev_startkit.php=+:
! parameter=+:104=+:347=+:startkit_test_custom=+:startkit_module_select=+:=+:
  parameter=+:104=+:348=+:startkit_test_number=+:Number=+:0=+:
! parameter=+:104=+:349=+:startkit_test_string=+:Text=+:enter a string=+:
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
  block=+:=+:Demo - DevelopersStartkitFunction=+:Demo block=+:104=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1

[mxbb-commits] mx_dev_startkit DevelopersStartkit.pak,NONE,1.1 db_install.php,1.1,1.2 db_uninstall.php,1.1,1.2 db_upgrade.php,1.1,1.2 mx_dev_startkit.php,1.1,1.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_dev_startkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv378/modules/mx_dev_startkit

Modified Files:
	db_install.php db_uninstall.php db_upgrade.php 
	mx_dev_startkit.php 
Added Files:
	DevelopersStartkit.pak 
Log Message:
adding this dev startkit module

--- NEW FILE: DevelopersStartkit.pak ---
module=+:60=+:Developers Startkit Module=+:modules/mx_dev_startkit/=+:Developers resource, demonstrating how to develope a mxBB module, by giving examples=+:1
New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
function=+:60=+:104=+:DevelopersStartkitFunction=+:Startkit Function=+:mx_dev_startkit.php=+:
parameter=+:104=+:349=+:startkit_test_custom=+:startkit_group_select=+:=+:
parameter=+:104=+:348=+:startkit_test_number=+:Number=+:0=+:
parameter=+:104=+:347=+:startkit_test_string=+:Text=+:enter a string=+:
parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
block=+:=+:Demo - DevelopersStartkitFunction=+:Demo block=+:104=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
function=+:0=+:0=+:0=+:endoflist=+:0=+:0

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_dev_startkit/db_upgrade.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** db_upgrade.php	22 Oct 2005 12:40:33 -0000	1.1
--- db_upgrade.php	22 Oct 2005 22:42:31 -0000	1.2
***************
*** 21,24 ****
--- 21,25 ----
  
  define( 'IN_PORTAL', true );
+ 
  if ( !defined( 'IN_ADMIN' ) )
  {
***************
*** 42,47 ****
  }
  
! $mx_module_version = 'mxBB - phpBB Integration Module 1.0.3';
! $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb" >phpBB</a>';
  
  $sql = array();
--- 43,48 ----
  }
  
! $mx_module_version = 'mxBB - Developers Startkit Module 1.0';
! $mx_module_copy = 'How to write a mxBB module? This module demonstrates by giving examples. Author: Jon';
  
  $sql = array();
***************
*** 50,110 ****
  // Precheck
  //
! if ( $result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "phpbb_plugin_config" ) )
  { 
  	//
  	// Upgrade checks
  	//
  	$upgrade_101 = 0;
- 	$upgrade_102 = 0;
- 	$upgrade_103 = 0;
- 	$upgrade_104 = 0;
- 	$upgrade_105 = 0;
- 	$upgrade_106 = 0;
- 	$upgrade_107 = 0;
  
  	//
! 	// validate before 1.01
  	//
! 	$result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "phpbb_plugin_config WHERE config_name = 'override_default_pages'" );
! 	if ( $db->sql_numrows( $result ) == 0 )
! 	{
! 		$upgrade_101 = 1;
! 	}
! 
! 	$result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "phpbb_plugin_config WHERE config_name = 'enable_module'" );
  	if ( $db->sql_numrows( $result ) == 0 )
  	{
! 		$upgrade_102 = 1;
  	}
  
- 
  	$message = "<b>Upgrading!</b><br/><br/>";
  
! 	if ( $upgrade_101 == 1 )
! 	{
! 		$message .= "<b>Upgrading to v. 1.01...</b><br/><br/>";
! 		$sql[] = "CREATE TABLE " . $mx_table_prefix . "phpbb_plugin_config (
! 		  			 	   	    config_name VARCHAR(255) NOT NULL default '', 
! 								config_value varchar(255) NOT NULL default '',
! 								PRIMARY KEY  (config_name)
! 								) TYPE=MyISAM";
! 
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('override_default_pages', 'Block_setup')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('faq', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('groupcp', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('index', '2')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('login', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('memberlist', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('modcp', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('posting', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('privmsg', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('profile', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('search', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewonline', '0')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('other', '0')";
! 	}
! 	else if ( $upgrade_102 == 1 )
  	{
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('enable_module', '1')";
  	}
  	else
--- 51,85 ----
  // Precheck
  //
! if ( $result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "dev_startkit_config" ) )
  { 
  	//
  	// Upgrade checks
  	//
+ 	$upgrade_100 = 0;
  	$upgrade_101 = 0;
  
  	//
! 	// validate before 1.0.0
  	//
! 	$result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "dev_startkit_config WHERE config_name = 'test1'" );
  	if ( $db->sql_numrows( $result ) == 0 )
  	{
! 		$upgrade_100 = 1;
  	}
  
  	$message = "<b>Upgrading!</b><br/><br/>";
  
! 	if ( $upgrade_100 == 1 )
  	{
! 		$message .= "<b>Upgrading to v. 1.00...</b><br/><br/>";
! 		
! 		$sql[] = "CREATE TABLE " . $mx_table_prefix . "dev_startkit_config (
! 	  			 	   	    config_name VARCHAR(255) NOT NULL default '', 
! 							config_value varchar(255) NOT NULL default '',
! 							PRIMARY KEY  (config_name)
! 							) TYPE=MyISAM";
! 	
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "dev_startkit_config VALUES ('startkit_config1', 'test1')";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "dev_startkit_config VALUES ('startkit_config1', 'test2')";
  	}
  	else

Index: db_uninstall.php
===================================================================
RCS file: /cvsroot/mxbb/mx_dev_startkit/db_uninstall.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** db_uninstall.php	22 Oct 2005 12:40:33 -0000	1.1
--- db_uninstall.php	22 Oct 2005 22:42:31 -0000	1.2
***************
*** 21,24 ****
--- 21,25 ----
  
  define( 'IN_PORTAL', true );
+ 
  if ( !defined( 'IN_ADMIN' ) )
  {
***************
*** 43,47 ****
  
  $sql = array( 
! 	"DROP TABLE IF EXISTS " . $mx_table_prefix . "phpbb_plugin_config", 
  	);
  
--- 44,48 ----
  
  $sql = array( 
! 	"DROP TABLE IF EXISTS " . $mx_table_prefix . "dev_startkit_config", 
  	);
  

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_dev_startkit/db_install.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** db_install.php	22 Oct 2005 12:40:33 -0000	1.1
--- db_install.php	22 Oct 2005 22:42:31 -0000	1.2
***************
*** 21,24 ****
--- 21,25 ----
   
  define( 'IN_PORTAL', true );
+ 
  if ( !defined( 'IN_ADMIN' ) )
  {
***************
*** 42,59 ****
  }
  
! $mx_module_version = 'mxBB - phpBB Integration Module 1.0.3';
! $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a>';
  
- // If fresh install
  
! if ( !$result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "phpbb_plugin_config" ) )
  {
  	$message = "<b>This is a fresh install!</b><br/><br/>";
  
  	$sql = array();
  
! 	$sql[] = "DROP TABLE IF EXISTS " . $mx_table_prefix . "phpbb_plugin_config";
  
! 	$sql[] = "CREATE TABLE " . $mx_table_prefix . "phpbb_plugin_config (
    			 	   	    config_name VARCHAR(255) NOT NULL default '', 
  						config_value varchar(255) NOT NULL default '',
--- 43,62 ----
  }
  
! $mx_module_version = 'mxBB - Developers Startkit Module 1.0';
! $mx_module_copy = 'How to write a mxBB module? This module demonstrates by giving examples. Author: Jon';
  
  
! if ( !$result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "dev_startkit_config" ) )
  {
+ 	//
+ 	// Fresh install
+ 	//
  	$message = "<b>This is a fresh install!</b><br/><br/>";
  
  	$sql = array();
  
! 	$sql[] = "DROP TABLE IF EXISTS " . $mx_table_prefix . "dev_startkit_config";
  
! 	$sql[] = "CREATE TABLE " . $mx_table_prefix . "dev_startkit_config (
    			 	   	    config_name VARCHAR(255) NOT NULL default '', 
  						config_value varchar(255) NOT NULL default '',
***************
*** 61,83 ****
  						) TYPE=MyISAM";
  
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('override_default_pages', 'Block_setup')";
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('enable_module', '1')";	
! 	
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('faq', '0')";
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('groupcp', '0')";
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('index', '2')";
! 	//$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewforum', '0')";
! 	//$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewtopic', '0')";
! 	//$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('modcp', '0')";
! 	//$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('posting', '0')";
  	
- 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('login', '0')";
- 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('memberlist', '0')";
- 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('privmsg', '0')";
- 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('profile', '0')";
- 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('search', '0')";
- 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewonline', '0')";
- 	$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('other', '0')";
- 
  	$sql[] = "UPDATE " . $mx_table_prefix . "module" . "
  				    SET module_version  = '" . $mx_module_version . "',
--- 64,70 ----
  						) TYPE=MyISAM";
  
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "dev_startkit_config VALUES ('startkit_config1', 'test1')";
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "dev_startkit_config VALUES ('startkit_config2', 'test2')";	
  	
  	$sql[] = "UPDATE " . $mx_table_prefix . "module" . "
  				    SET module_version  = '" . $mx_module_version . "',
***************
*** 89,94 ****
  else
  { 
! 	// If already installed
! 	$message = "<b>Module is already installed...consider upgrading ;)</b><br/><br/>";
  }
  
--- 76,83 ----
  else
  { 
! 	//
! 	// Updating
! 	//
! 	$message = "<b>Nothing to do... ;)</b><br/><br/>";
  }
  

Index: mx_dev_startkit.php
===================================================================
RCS file: /cvsroot/mxbb/mx_dev_startkit/mx_dev_startkit.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_dev_startkit.php	22 Oct 2005 12:40:33 -0000	1.1
--- mx_dev_startkit.php	22 Oct 2005 22:42:31 -0000	1.2
***************
*** 99,102 ****
--- 99,108 ----
  
  //
+ // Load module constants and functions
+ //
+ include_once($mx_root_path . $mx_block->module_root_path . "includes/startkit_constants.$phpEx"); // Will load additional module lang keys, definitions, copyrights and theme data 
+ include_once($mx_root_path . $mx_block->module_root_path . "includes/startkit_functions.$phpEx"); // Will load additional module functions (be sure to prefix with 'mx_' to avoid function conflicts)
+ 
+ //
  // Load POST/GET vars
  // - When php.ini is set with Register Globals Off (highly recommended due to security), you need to declare all GET/POST vars
***************
*** 111,115 ****
  if ( !$result = $db->sql_query( $sql ) )
  {
! 	message_die( CRITICAL_ERROR, "Could not query config information in kb_config", "", __LINE__, __FILE__, $sql );
  }
  else
--- 117,121 ----
  if ( !$result = $db->sql_query( $sql ) )
  {
! 	message_die( CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql );
  }
  else
***************
*** 125,130 ****
  
  //
! // Load module block parameters
  // - be careful not to use too common variable names - to avoid conflicts with other blocks
  //
  // If possible, do this instead
--- 131,137 ----
  
  //
! // Load (custom) module block parameters
  // - be careful not to use too common variable names - to avoid conflicts with other blocks
+ // - additional module parameters are defined in module_root/admin/mx_module_defs.php
  //
  // If possible, do this instead
***************
*** 132,144 ****
  // $mx_startkit_pars['test_string'] = $mx_block->get_parameters( 'startkit_test_string' );
  // $mx_startkit_pars['test_number'] = $mx_block->get_parameters( 'startkit_test_number' );
  //
  $mx_par_test_string = $mx_block->get_parameters( 'startkit_test_string' );
  $mx_par_test_number = $mx_block->get_parameters( 'startkit_test_number' );
!  
  //
! // Load module constants and functions
  //
! include_once($mx_root_path . $mx_block->module_root_path . "includes/mx_module_constants.$phpEx"); // Will load additional module lang keys, definitions, copyrights and theme data 
! include_once($mx_root_path . $mx_block->module_root_path . "includes/mx_module_functions.$phpEx"); // Will load additional module functions (be sure to prefix with 'mx_' to avoid function conflicts)
  
  //
--- 139,158 ----
  // $mx_startkit_pars['test_string'] = $mx_block->get_parameters( 'startkit_test_string' );
  // $mx_startkit_pars['test_number'] = $mx_block->get_parameters( 'startkit_test_number' );
+ // $mx_startkit_pars['test_custom'] = $mx_block->get_parameters( 'startkit_test_custom' );
  //
  $mx_par_test_string = $mx_block->get_parameters( 'startkit_test_string' );
  $mx_par_test_number = $mx_block->get_parameters( 'startkit_test_number' );
! $mx_par_test_custom = $mx_block->get_parameters( 'startkit_test_custom' );
! 
  //
! // Get Module Name from module_id
  //
! $sql = "SELECT module_name FROM " . MODULE_TABLE . " WHERE module_id = " . $mx_par_test_custom;
! if ( !$result = $db->sql_query( $sql ) )
! {
! 	message_die( CRITICAL_ERROR, "Could not query module information", "", __LINE__, __FILE__, $sql );
! } 
! $results = $db->sql_fetchrow( $result );
! $startkit_module_name = $results['module_name'];
  
  //
***************
*** 150,154 ****
  // Start output of Block
  //
! $template->set_filenames( array( 'body' => 'kb_index_body.tpl' ));
  
  //
--- 164,168 ----
  // Start output of Block
  //
! $template->set_filenames( array( 'body' => 'startkit_body.tpl' ));
  
  //
***************
*** 170,189 ****
  //
  $template->assign_vars( array( 
! 	'L_STARTKIT_INFO' => $lang['Startkit_info'],
  	
  	'L_TEST_STRING' => $lang['Test_string'],
  	'L_TEST_NUMBER' => $lang['Test_number'],
- 	'L_TEST_NUMBER' => $lang['Test_config1'],
- 	'L_TEST_NUMBER' => $lang['Test_config2'],
- 	'L_TEST_GET_PAR' => $lang['Test_get_par'],
  	
  	'TEST_STRING' => $mx_par_test_string,
  	'TEST_NUMBER' => $mx_par_test_number,
! 	'MANIPULATED_TEST_NUMBER' => $mx_manipulated_test_number,
  	
  	'TEST_CONFIG1' => $mx_module_configs['startkit_config1'],
  	'TEST_CONFIG2' => $mx_module_configs['startkit_config2'],	
  	
! 	'TEST_GET_PAR' => $par_test_get_par
  ));
  		
--- 184,226 ----
  //
  $template->assign_vars( array( 
! 	//
! 	// Titles
! 	//
! 	'L_STARTKIT' => $lang['Startkit'],
  	
+ 	'L_STARTKIT_PARAMETER' => $lang['Startkit_parameter'],
+ 	'L_STARTKIT_PARAMETER_EXPLAIN' => $lang['Startkit_parameter_explain'],
  	'L_TEST_STRING' => $lang['Test_string'],
  	'L_TEST_NUMBER' => $lang['Test_number'],
  	
+ 	'L_STARTKIT_PARAMETER_MODIFIED' => $lang['Startkit_parameter_modified'],
+ 	'L_STARTKIT_PARAMETER_MODIFIED_EXPLAIN' => $lang['Startkit_parameter_modified_explain'],
+ 	'L_TEST_MODIFIED' => $lang['Test_modified'],
+ 	
+ 	'L_STARTKIT_PARAMETER_CUSTOM' => $lang['Startkit_parameter_custom'],
+ 	'L_STARTKIT_PARAMETER_CUSTOM_EXPLAIN' => $lang['Startkit_parameter_custom_explain'],
+ 	'L_TEST_CUSTOM' => $lang['Test_custom'],
+ 	
+ 	'L_STARTKIT_CONFIG' => $lang['Startkit_config'],
+ 	'L_STARTKIT_CONFIG_EXPLAIN' => $lang['Startkit_config_explain'],
+ 	'L_TEST_CONFIG1' => $lang['Test_config1'],
+ 	'L_TEST_CONFIG2' => $lang['Test_config2'],
+ 	
+ 	'L_STARTKIT_GET' => $lang['Startkit_get'],
+ 	'L_STARTKIT_GET_EXPLAIN' => $lang['Startkit_get_explain'],
+ 	'L_TEST_GET' => $lang['Test_get_par'],
+ 	
+ 	//
+ 	// Values
+ 	//
  	'TEST_STRING' => $mx_par_test_string,
  	'TEST_NUMBER' => $mx_par_test_number,
! 	'TEST_MODIFIED' => $mx_manipulated_test_number,
! 	'TEST_CUSTOM' => $startkit_module_name,
  	
  	'TEST_CONFIG1' => $mx_module_configs['startkit_config1'],
  	'TEST_CONFIG2' => $mx_module_configs['startkit_config2'],	
  	
! 	'TEST_GET' => $test_get_var
  ));