[mxbb-commits] core common.php,1.91,1.92 index.php,1.76,1.77

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

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

Modified Files:
	common.php index.php 
Log Message:
No panic, only cosmetics, file headers and newlines etc... ;)

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** common.php	10 Jun 2008 03:35:19 -0000	1.91
--- common.php	15 Jun 2008 09:15:42 -0000	1.92
***************
*** 15,21 ****
--- 15,27 ----
  }
  
+ //
+ // To be able to include phpBB functions/methods
+ //
  define('IN_PHPBB', 1);
  define('PHPBB_INSTALLED', true);
  
+ //
+ // Reset stats
+ //
  $mx_starttime = explode(' ', microtime());
  $mx_starttime = $mx_starttime[1] + $mx_starttime[0];
***************
*** 367,370 ****
--- 373,379 ----
  define('PHPBB_URL', $server_url_phpbb);
  
+ //
+ // In phpBB mode, we rely on native phpBB configs, thus we need to sync mxp and phpbb settings
+ //
  mx_page::sync_configs();
  

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** index.php	27 Apr 2008 18:44:42 -0000	1.76
--- index.php	15 Jun 2008 09:15:42 -0000	1.77
***************
*** 43,56 ****
  
  //
- // Handy switch, when recostructing the site. Only admin is able to view pages and browse around normally
- //
- /*
- if( !($mx_user->data['user_level'] == ADMIN && $mx_user->data['session_logged_in']) )
- {
- 	mx_message_die(GENERAL_MESSAGE, 'We are currently upgrading this site with latest MX-Publisher software. Hopefully everything will run smoothly again later tonight (GMT). /Jon', 'Information');
- }
- */
- 
- //
  // Site under reconstruction
  //
--- 43,46 ----
***************
*** 96,100 ****
  
  //
! // Start output of page blocks
  // ------------------------------------------------------------------------------------------------------------
  //
--- 86,90 ----
  
  //
! // Start output of page
  // ------------------------------------------------------------------------------------------------------------
  //
***************
*** 184,188 ****
  				}
  
- 
  				//
  				// View Auth -------------------------------------------------------------------------------
--- 174,177 ----
***************
*** 327,331 ****
  				}
  
- 
  			} // for ... subblocks
  
--- 316,319 ----