[mxbb-commits] core common.php,1.56,1.57

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

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

Modified Files:
	common.php 
Log Message:
Further minor tweaks...

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** common.php	26 Jun 2006 21:32:22 -0000	1.56
--- common.php	27 Jun 2006 18:12:22 -0000	1.57
***************
*** 183,188 ****
--- 183,194 ----
  $gen_simple_header = FALSE;
  
+ //
+ // Read main config file
+ //
  @include_once($mx_root_path . 'config.' . $phpEx);
  
+ //
+ // Redirect for fresh mxBB install
+ //
  if( !defined('MX_INSTALLED') )
  {
***************
*** 192,195 ****
--- 198,205 ----
  
  str_replace("//", "/", $phpbb_root_path);
+ 
+ //
+ // mxBB Includes
+ //
  include_once($mx_root_path . 'includes/mx_constants.' . $phpEx); // Also includes phpBB constants
  include_once($mx_root_path . 'includes/mx_functions_style.' . $phpEx); // Extends the phpBB template class
***************
*** 198,205 ****
  // phpBB Includes
  //
- include_once($phpbb_root_path . 'includes/sessions.' . $phpEx);
  include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
- //include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
  
  include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class
  include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions
--- 208,216 ----
  // phpBB Includes
  //
  include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
  
+ //
+ // More mxBB Includes
+ //
  include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class
  include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions
***************
*** 215,220 ****
--- 226,237 ----
  $mx_cache = new mx_cache();
  
+ //
+ // Get mxBB config settings
+ //
  $portal_config = $mx_cache->obtain_mxbb_config();
  
+ //
+ // Define some general Defs
+ //
  define('PHPBB_URL', $portal_config['portal_phpbb_url']);
  define('PORTAL_URL', $portal_config['portal_url']);
***************
*** 222,226 ****
  
  //
! // instantiate the mx_mod_rewrite class (if activated)
  //
  if ($portal_config['mod_rewrite'])
--- 239,243 ----
  
  //
! // Instantiate the mx_mod_rewrite class (if activated)
  //
  if ($portal_config['mod_rewrite'])
***************
*** 262,267 ****
  // basic forum information is not available
  //
! if( @file_exists($phpbb_root_path . 'includes/class_config.' . $phpEx) &&
! 	@file_exists($phpbb_root_path . 'includes/class_groups.' . $phpEx) )
  {
  	include($mx_root_path . 'includes/mx_functions_ch.'.$phpEx);
--- 279,283 ----
  // basic forum information is not available
  //
! if( @file_exists($phpbb_root_path . 'includes/class_config.' . $phpEx) && @file_exists($phpbb_root_path . 'includes/class_groups.' . $phpEx) )
  {
  	include($mx_root_path . 'includes/mx_functions_ch.'.$phpEx);
***************
*** 269,276 ****
--- 285,297 ----
  else
  {
+ 	//
  	// Grab phpBB global variables, re-cache if necessary
+ 	//
  	$board_config = $mx_cache->obtain_phpbb_config();
  }
  
+ //
+ // Is phpBB File Attachment MOD present?
+ //
  if( file_exists($phpbb_root_path . 'attach_mod') )
  {
***************
*** 278,281 ****
--- 299,305 ----
  }
  
+ //
+ // Remove install and contrib folders
+ //
  if( file_exists('install') || file_exists('contrib') )
  {
***************
*** 283,286 ****
--- 307,313 ----
  }
  
+ //
+ // Extra admin debug footer
+ //
  if (defined('DEBUG_EXTRA'))
  {
***************
*** 306,309 ****
  $do_gzip_compress = FALSE;
  mx_session_start();			// Note: this needs $board_config populated!
- 
  ?>
\ No newline at end of file
--- 333,335 ----