[mxbb-commits] core/includes mx_functions_admincp.php, 1.54, 1.55 mx_functions_bbcode.php, 1.8, 1.9 mx_functions_phpbb.php, 1.72, 1.73 mx_functions_tools.php, 1.36, 1.37

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

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

Modified Files:
	mx_functions_admincp.php mx_functions_bbcode.php 
	mx_functions_phpbb.php mx_functions_tools.php 
Log Message:
Moving load_file to mx_cache...

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** mx_functions_admincp.php	15 Jun 2008 21:00:00 -0000	1.54
--- mx_functions_admincp.php	10 Jul 2008 23:02:05 -0000	1.55
***************
*** 3128,3133 ****
  		global $db, $phpbb_root_path, $board_config, $lang, $phpEx;
  
! 		mx_page::load_file('functions_search', 'phpbb2');
! 		//include_once($phpbb_root_path . 'includes/functions_search.' . $phpEx);
  
  		$search_match_table = MX_MATCH_TABLE;
--- 3128,3132 ----
  		global $db, $phpbb_root_path, $board_config, $lang, $phpEx;
  
! 		mx_cache::load_file('functions_search', 'phpbb2');
  
  		$search_match_table = MX_MATCH_TABLE;

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** mx_functions_phpbb.php	10 Jul 2008 20:46:36 -0000	1.72
--- mx_functions_phpbb.php	10 Jul 2008 23:02:05 -0000	1.73
***************
*** 1661,1666 ****
  		{
  			global $phpbb_root_path, $phpEx;
! 			mx_page::load_file('bbcode', 'phpbb3');
! 			//include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
  		}
  
--- 1661,1665 ----
  		{
  			global $phpbb_root_path, $phpEx;
! 			mx_cache::load_file('bbcode', 'phpbb3');
  		}
  

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** mx_functions_tools.php	10 Jul 2008 22:58:26 -0000	1.36
--- mx_functions_tools.php	10 Jul 2008 23:02:06 -0000	1.37
***************
*** 1623,1627 ****
  if( !function_exists('generate_smilies') )
  {
! 	mx_page::load_file('functions_post');
  }
  
--- 1623,1627 ----
  if( !function_exists('generate_smilies') )
  {
! 	mx_cache::load_file('functions_post');
  }
  
***************
*** 3123,3127 ****
  		// Includes
  		//
! 		mx_page::load_file('functions_search', 'phpbb2');
  
  		//
--- 3123,3127 ----
  		// Includes
  		//
! 		mx_cache::load_file('functions_search', 'phpbb2');
  
  		//

Index: mx_functions_bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mx_functions_bbcode.php	18 Jun 2008 11:36:06 -0000	1.8
--- mx_functions_bbcode.php	10 Jul 2008 23:02:05 -0000	1.9
***************
*** 105,109 ****
  
  	$bbcode_tpl['email'] = str_replace('{EMAIL}', '\\1', $bbcode_tpl['email']);
! 	
  	//Start more bbcode
  	$bbcode_tpl['stream'] = str_replace('{URL}', '\\1', $bbcode_tpl['stream']);
--- 105,109 ----
  
  	$bbcode_tpl['email'] = str_replace('{EMAIL}', '\\1', $bbcode_tpl['email']);
! 
  	//Start more bbcode
  	$bbcode_tpl['stream'] = str_replace('{URL}', '\\1', $bbcode_tpl['stream']);
***************
*** 232,236 ****
  
  	//Strat more bbcode
! 	
  	// [stream]Sound URL[/stream] code..
  	$patterns[] = "#\[stream:$uid\](.*?)\[/stream:$uid\]#si";
--- 232,236 ----
  
  	//Strat more bbcode
! 
  	// [stream]Sound URL[/stream] code..
  	$patterns[] = "#\[stream:$uid\](.*?)\[/stream:$uid\]#si";
***************
*** 245,257 ****
  	$replacements[] = $bbcode_tpl['video'];
  	$text = preg_replace($patterns, $replacements, $text);
! 	
  	// [GVideo]GVideo URL[/GVideo] code..
      $patterns[] = "#\[GVideo\]http://video.google.[A-Za-z0-9.]{2,5}/videoplay\?docid=([0-9A-Za-z-_]*)[^[]*\[/GVideo\]#is";
      $replacements[] = $bbcode_tpl['GVideo'];
!          
      // [youtube]YouTube URL[/youtube] code..
      $patterns[] = "#\[youtube\]http://(?:www\.)?youtube.com/watch\?v=([0-9A-Za-z-_]{11})[^[]*\[/youtube\]#is";
!     $replacements[] = $bbcode_tpl['youtube'];	
! 	
  	//Stop more bbcode
  
--- 245,257 ----
  	$replacements[] = $bbcode_tpl['video'];
  	$text = preg_replace($patterns, $replacements, $text);
! 
  	// [GVideo]GVideo URL[/GVideo] code..
      $patterns[] = "#\[GVideo\]http://video.google.[A-Za-z0-9.]{2,5}/videoplay\?docid=([0-9A-Za-z-_]*)[^[]*\[/GVideo\]#is";
      $replacements[] = $bbcode_tpl['GVideo'];
! 
      // [youtube]YouTube URL[/youtube] code..
      $patterns[] = "#\[youtube\]http://(?:www\.)?youtube.com/watch\?v=([0-9A-Za-z-_]{11})[^[]*\[/youtube\]#is";
!     $replacements[] = $bbcode_tpl['youtube'];
! 
  	//Stop more bbcode
  
***************
*** 334,338 ****
  
  	//Stop more bbcode
! 	
  	// Remove our padding from the string..
  	return substr($text, 1);;
--- 334,338 ----
  
  	//Stop more bbcode
! 
  	// Remove our padding from the string..
  	return substr($text, 1);;
***************
*** 733,737 ****
  	if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass'))
  	{
! 		mx_page::load_file('bbcode');
  	}
  
--- 733,737 ----
  	if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass'))
  	{
! 		mx_cache::load_file('bbcode');
  	}
  
***************
*** 741,745 ****
  		if (!class_exists('bbcode'))
  		{
! 			mx_page::load_file('bbcode', 'phpbb3');
  		}
  
--- 741,745 ----
  		if (!class_exists('bbcode'))
  		{
! 			mx_cache::load_file('bbcode', 'phpbb3');
  		}
  
***************
*** 782,803 ****
  		case 'internal':
  			$smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed
! 			$smiley_root_path =	$phpbb_root_path; //same here	
  			$smiley_url = 'smile_url';
  			$smiley_id = 'smilies_id';
! 			$emotion = 'emoticon';		
  		break;
  		case 'phpbb2':
  			$smiley_path_url = PHPBB_URL;
! 			$smiley_root_path =	$phpbb_root_path;		
  			$smiley_url = 'smile_url';
  			$smiley_id = 'smilies_id';
! 			$emotion = 'emoticon';		
  		break;
  		case 'phpbb3':
  			$smiley_path_url = PHPBB_URL;
! 			$smiley_root_path =	$phpbb_root_path;		
  			$smiley_url = 'smiley_url';
  			$smiley_id = 'smiley_id';
! 			$emotion = 'emotion';		
  			$board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']);
  		break;
--- 782,803 ----
  		case 'internal':
  			$smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed
! 			$smiley_root_path =	$phpbb_root_path; //same here
  			$smiley_url = 'smile_url';
  			$smiley_id = 'smilies_id';
! 			$emotion = 'emoticon';
  		break;
  		case 'phpbb2':
  			$smiley_path_url = PHPBB_URL;
! 			$smiley_root_path =	$phpbb_root_path;
  			$smiley_url = 'smile_url';
  			$smiley_id = 'smilies_id';
! 			$emotion = 'emoticon';
  		break;
  		case 'phpbb3':
  			$smiley_path_url = PHPBB_URL;
! 			$smiley_root_path =	$phpbb_root_path;
  			$smiley_url = 'smiley_url';
  			$smiley_id = 'smiley_id';
! 			$emotion = 'emotion';
  			$board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']);
  		break;
***************
*** 857,866 ****
  	if( !function_exists('generate_smilies') )
  	{
! 		mx_page::load_file('functions_post', 'phpbb2');
  	}
  
  	if( !function_exists('smilies_pass') && (PORTAL_BACKEND == 'phpbb2') )
  	{
! 		mx_page::load_file('bbcode', 'phpbb2');
  	}
  
--- 857,866 ----
  	if( !function_exists('generate_smilies') )
  	{
! 		mx_cache::load_file('functions_post', 'phpbb2');
  	}
  
  	if( !function_exists('smilies_pass') && (PORTAL_BACKEND == 'phpbb2') )
  	{
! 		mx_cache::load_file('bbcode', 'phpbb2');
  	}