[mxbb-commits] mx_news/admin admin_mx_news.php,1.1,1.2

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

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

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

Index: admin_mx_news.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/admin/admin_mx_news.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_mx_news.php	8 Feb 2008 21:57:46 -0000	1.1
--- admin_mx_news.php	15 Feb 2008 22:13:26 -0000	1.2
***************
*** 11,14 ****
--- 11,59 ----
  define( 'IN_PORTAL', true );
  
+ $phpEx = substr(strrchr(__FILE__, '.'), 1);
+ 
+ if ( @file_exists( './../viewtopic.'.$phpEx ) )
+ {
+ 	define( 'IN_PHPBB', 1 );
+ 	define( 'MXBB_MODULE', false );
+ 
+ 	//
+ 	// Main paths
+ 	//
+ 	$phpbb_root_path = $module_root_path = $mx_root_path = "./../";
+ 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
+ 
+ 	//
+ 	// Left Pane Paths
+ 	//
+ 	$setmodules_admin_path = '';
+ 	$setmodules_module_path = "./../";
+ 
+ 	require_once( $phpbb_root_path . 'extension.inc' );
+ 	require_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
+ }
+ else
+ {
+ 	define( 'IN_PORTAL', 1 );
+ 	define( 'MXBB_MODULE', true );
+ 
+ 	//
+ 	// Main paths
+ 	//
+ 	$mx_root_path = './../../../';
+ 	$module_root_path = './../../../modules/mx_kb/';
+ 
+ 	//
+ 	// Left Pane Paths
+ 	//
+ 	$setmodules_root_path = './../';
+ 	$setmodules_module_path = 'modules/mx_kb/';
+ 	$setmodules_admin_path = $setmodules_module_path . 'admin/';
+ 
+ 	define( 'MXBB_27x', file_exists( $setmodules_root_path . 'mx_login.php' ) );
+ 
+ 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
+ }
+ 
  if ( !empty( $setmodules ) )
  {
***************
*** 18,26 ****
  }
  
! $mx_root_path = '../../../';
! $module_root_path = "../";
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
  require( $mx_root_path . '/admin/pagestart.' . $phpEx );
- 
  include( $module_root_path . 'mx_news/mx_news_common.' . $phpEx );
  
--- 63,70 ----
  }
  
! //
! // Includes
! //
  require( $mx_root_path . '/admin/pagestart.' . $phpEx );
  include( $module_root_path . 'mx_news/mx_news_common.' . $phpEx );
  
***************
*** 28,38 ****
  // 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 );
  }
  
--- 72,96 ----
  // Read language definition
  // **********************************************************************
! if ( !MXBB_MODULE )
  {
! 	if ( !file_exists( $module_root_path . 'mxnews/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! 	{
! 		include( $module_root_path . 'mxnews/language/lang_english/lang_admin.' . $phpEx );
! 	}
! 	else
! 	{
! 		include( $module_root_path . 'mxnews/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 );
! 	}
  }
  
***************
*** 58,61 ****
  
  include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
- 
  ?>
\ No newline at end of file
--- 116,118 ----