[mxbb-commits] core/admin admin_mx_block_cp.php, 1.22, 1.23 index_jon.php, 1.1, 1.2 index_new.php, 1.14, 1.15 pagestart.php, 1.36, 1.37

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

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

Modified Files:
	admin_mx_block_cp.php index_jon.php index_new.php 
	pagestart.php 
Log Message:
Moving load_file to mx_cache...

Index: pagestart.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** pagestart.php	15 Jun 2008 20:59:59 -0000	1.36
--- pagestart.php	10 Jul 2008 23:17:13 -0000	1.37
***************
*** 25,29 ****
  if( !function_exists('generate_smilies') )
  {
! 	mx_page::load_file('functions_post');
  }
  
--- 25,29 ----
  if( !function_exists('generate_smilies') )
  {
! 	mx_cache::load_file('functions_post');
  }
  

Index: index_jon.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index_jon.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index_jon.php	15 Jun 2008 21:00:00 -0000	1.1
--- index_jon.php	10 Jul 2008 23:17:13 -0000	1.2
***************
*** 140,146 ****
  		if ( PORTAL_BACKEND == 'phpbb2' )
  		{
! 			mx_page::load_file( 'functions', true );
! 			mx_page::load_file( 'functions_selects', true );
! 			mx_page::load_file( 'functions_validate', true );
  		}
  
--- 140,146 ----
  		if ( PORTAL_BACKEND == 'phpbb2' )
  		{
! 			mx_cache::load_file( 'functions', true );
! 			mx_cache::load_file( 'functions_selects', true );
! 			mx_cache::load_file( 'functions_validate', true );
  		}
  
***************
*** 148,158 ****
  		{
  			include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx );
! 			mx_page::load_file( 'functions_admin', 'phpbb3' );
! 			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' );
! 			mx_page::load_file( 'message_parser' , 'phpbb3' );
  
  			$phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/';
--- 148,158 ----
  		{
  			include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx );
! 			mx_cache::load_file( 'functions_admin', 'phpbb3' );
! 			mx_cache::load_file( 'acp/auth', 'phpbb3' );
! 			mx_cache::load_file( 'auth', 'phpbb3');
! 			mx_cache::load_file( 'functions', 'phpbb3' );
! 			mx_cache::load_file( 'functions', 'phpbb2' );
! 			mx_cache::load_file( 'functions_module', 'phpbb3' );
! 			mx_cache::load_file( 'message_parser' , 'phpbb3' );
  
  			$phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/';

Index: index_new.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index_new.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** index_new.php	20 Jun 2008 15:55:03 -0000	1.14
--- index_new.php	10 Jul 2008 23:17:13 -0000	1.15
***************
*** 49,53 ****
  {
  	global $mx_root_path, $phpEx;
! 	
  	$info_global = "";
  	foreach( $_GET as $key => $value)
--- 49,53 ----
  {
  	global $mx_root_path, $phpEx;
! 
  	$info_global = "";
  	foreach( $_GET as $key => $value)
***************
*** 65,71 ****
  		$file = "_{$file}";
  	}
! 	
  	return "{$mx_root_path}cache/acp_{$part}{$file}.{$phpEx}";
! 	
  }
  
--- 65,71 ----
  		$file = "_{$file}";
  	}
! 
  	return "{$mx_root_path}cache/acp_{$part}{$file}.{$phpEx}";
! 
  }
  
***************
*** 76,80 ****
  	fwrite( $fopen, "<?php\r\n$code\r\n?>");
  	fclose( $fopen);
! 	return $filename; 
  }
  /**
--- 76,80 ----
  	fwrite( $fopen, "<?php\r\n$code\r\n?>");
  	fclose( $fopen);
! 	return $filename;
  }
  /**
***************
*** 133,150 ****
  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', 'phpbb3' );
  
! 	mx_page::load_file( 'functions', 'phpbb3' );
! 	mx_page::load_file( 'functions_module', 'phpbb3' );
! 	mx_page::load_file( 'functions_admin', 'phpbb3' );
! 	mx_page::load_file( 'functions_hook', 'phpbb3' );
! 	mx_page::load_file( 'bbcode', 'phpbb3');
  
  	$phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/';
--- 133,150 ----
  if ( PORTAL_BACKEND == PHPBB2X_BACKEND )
  {
! 	mx_cache::load_file( 'functions' );
! 	mx_cache::load_file( 'functions_selects' );
! 	mx_cache::load_file( 'functions_validate' );
  }
  if ( PORTAL_BACKEND == OLYMPUS_BACKEND )
  {
  	//include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx );
! 	mx_cache::load_file( 'acp/auth', 'phpbb3' );
  
! 	mx_cache::load_file( 'functions', 'phpbb3' );
! 	mx_cache::load_file( 'functions_module', 'phpbb3' );
! 	mx_cache::load_file( 'functions_admin', 'phpbb3' );
! 	mx_cache::load_file( 'functions_hook', 'phpbb3' );
! 	mx_cache::load_file( 'bbcode', 'phpbb3');
  
  	$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.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** admin_mx_block_cp.php	9 Mar 2008 23:37:59 -0000	1.22
--- admin_mx_block_cp.php	10 Jul 2008 23:17:13 -0000	1.23
***************
*** 28,34 ****
  if( !function_exists('generate_smilies') )
  {
! 	mx_page::load_file('functions_post');
  }
! mx_page::load_file('functions_search');
  
  //
--- 28,34 ----
  if( !function_exists('generate_smilies') )
  {
! 	mx_cache::load_file('functions_post');
  }
! mx_cache::load_file('functions_search');
  
  //