[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;