[mxbb-commits] mx_kb/admin admin_kb.php,1.5,1.6

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

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

Modified Files:
	admin_kb.php 
Log Message:
Updated, sync with phpBB2 standalone usage
Trailing newlines

Index: admin_kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_kb.php	22 Aug 2006 20:22:47 -0000	1.5
--- admin_kb.php	15 Feb 2008 22:11:31 -0000	1.6
***************
*** 11,15 ****
  define( 'IN_PORTAL', true );
  
! if ( file_exists( './../viewtopic.php' ) )
  {
  	define( 'IN_PHPBB', 1 );
--- 11,17 ----
  define( 'IN_PORTAL', true );
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists( './../viewtopic.'.$phpEx ) )
  {
  	define( 'IN_PHPBB', 1 );
***************
*** 20,23 ****
--- 22,26 ----
  	//
  	$phpbb_root_path = $module_root_path = $mx_root_path = "./../";
+ 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
  
  	//
***************
*** 28,31 ****
--- 31,35 ----
  
  	require_once( $phpbb_root_path . 'extension.inc' );
+ 	require_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
  }
  else
***************
*** 52,56 ****
  }
  
- 
  if ( !empty( $setmodules ) )
  {
--- 56,59 ----
***************
*** 76,86 ****
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 79,103 ----
  // Read language definition
  // **********************************************************************
! if ( !MXBB_MODULE )
  {
! 	if ( !file_exists( $module_root_path . 'kb/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! 	{
! 		include( $module_root_path . 'kb/language/lang_english/lang_admin.' . $phpEx );
! 	}
! 	else
! 	{
! 		include( $module_root_path . 'kb/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
! 	}
  }
  else
  {
! 	if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! 	{
! 		include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
! 	}
! 	else
! 	{
! 		include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
! 	}
  }