[mxbb-commits] core/admin admin_mx_block_cp.php, 1.20, 1.21 index_new.php, 1.9, 1.10 pagestart.php, 1.31, 1.32

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

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

Modified Files:
	admin_mx_block_cp.php index_new.php pagestart.php 
Log Message:
Updated load_file() method. Bugfix. The wrong file was included.

Index: pagestart.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** pagestart.php	9 Feb 2008 19:45:34 -0000	1.31
--- pagestart.php	22 Feb 2008 23:02:49 -0000	1.32
***************
*** 25,35 ****
  if( !function_exists('generate_smilies') )
  {
! 	mx_page::load_file('functions_post', 'phpbb2');
  }
! mx_page::load_file('functions_admin', !(PORTAL_BACKEND == 'internal') ? PORTAL_BACKEND : 'phpbb2');
  
  if (PORTAL_BACKEND == 'phpbb3')
  {
! 	mx_page::load_file('functions_module', 'phpbb3');
  }
  
--- 25,35 ----
  if( !function_exists('generate_smilies') )
  {
! 	mx_page::load_file('functions_post');
  }
! mx_page::load_file('functions_admin');
  
  if (PORTAL_BACKEND == 'phpbb3')
  {
! 	mx_page::load_file('functions_module');
  }
  

Index: index_new.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index_new.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index_new.php	11 Feb 2008 11:13:16 -0000	1.9
--- index_new.php	22 Feb 2008 23:02:49 -0000	1.10
***************
*** 100,118 ****
  if ( PORTAL_BACKEND == PHPBB2X_BACKEND )
  {
! 	// mx_page::load_file( 'functions', 'phpbb2');
! 	// mx_page::load_file( 'functions_selects', 'phpbb2'); // LOAD phpbb2 file functions_selects for 2.9x
! 	// mx_page::load_file( 'functions_validate', 'phpbb2');
! 	include_once( $phpbb_root_path . 'includes/functions_selects.' . $phpEx ); // LOAD phpbb2 file functions_select for 2.8.0
! 	include_once( $phpbb_root_path . 'includes/functions.php' );
! 	include_once( $phpbb_root_path . 'includes/functions_validate.' . $phpEx );
  }
  if ( PORTAL_BACKEND == OLYMPUS_BACKEND )
  {
  	include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx );
! 	mx_page::load_file( 'acp/auth', 'phpbb3' );
! 	// mx_page::load_file( 'auth', 'phpbb3');
! 	mx_page::load_file( 'functions', 'phpbb3' );
! 	mx_page::load_file( 'functions', 'phpbb2' );
! 	mx_page::load_file( 'functions_module', 'phpbb3' );
  	$phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/';
  }
--- 100,116 ----
  if ( PORTAL_BACKEND == PHPBB2X_BACKEND )
  {
! 	mx_page::load_file( 'functions' );
! 	mx_page::load_file( 'functions_selects' );
! 	mx_page::load_file( 'functions_validate' );
  }
  if ( PORTAL_BACKEND == OLYMPUS_BACKEND )
  {
  	include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx );
! 	mx_page::load_file( 'acp/auth' );
! 	// mx_page::load_file( 'auth');
! 	mx_page::load_file( 'functions' );
! 	// mx_page::load_file( 'functions', 'phpbb2' ); CULPRIT, You have to add this to the shared phpbb3 folder.
! 	mx_page::load_file( 'functions_module' );
! 
  	$phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/';
  }

Index: admin_mx_block_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** admin_mx_block_cp.php	9 Feb 2008 19:45:34 -0000	1.20
--- admin_mx_block_cp.php	22 Feb 2008 23:02:49 -0000	1.21
***************
*** 28,34 ****
  if( !function_exists('generate_smilies') )
  {
! 	mx_page::load_file('functions_post', 'phpbb2');
  }
! mx_page::load_file('functions_search', 'phpbb2');
  
  //
--- 28,34 ----
  if( !function_exists('generate_smilies') )
  {
! 	mx_page::load_file('functions_post');
  }
! mx_page::load_file('functions_search');
  
  //