[mxbb-commits] mx_phpbb/includes forum_hack.php,1.45,1.46

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

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

Modified Files:
	forum_hack.php 
Log Message:
Here we go again. I'm debugging this over at your place ;)

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** forum_hack.php	22 Feb 2008 11:36:34 -0000	1.45
--- forum_hack.php	22 Feb 2008 19:21:08 -0000	1.46
***************
*** 37,40 ****
--- 37,41 ----
  	include_once($phpbb_root_path . 'includes/auth.' . $phpEx);
  }
+ 
  if(!function_exists('get_db_stat'))
  {
***************
*** 52,69 ****
  }
  
- /*
- // Cannot be loaded here, since its functions load other includes
- if(!function_exists('clean_words'))
- {
- 	include_once($phpbb_root_path . 'includes/functions_search.' . $phpEx);
- }
- */
- 
  if(!function_exists('smilies_pass'))
  {
! 	include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); //This never work and youtube tag is parsed since bbcode is vannila
  }
  
! 
  //Check for mx_smartor fap version
  // We need to check the DB too, since we can have the files there but not installed !!
--- 53,62 ----
  }
  
  if(!function_exists('smilies_pass'))
  {
! 	include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
  }
  
! /*
  //Check for mx_smartor fap version
  // We need to check the DB too, since we can have the files there but not installed !!
***************
*** 77,80 ****
--- 70,74 ----
  	$db->sql_freeresult($result);
  }
+ */
  
  //
***************
*** 106,110 ****
  */
  
- 
  // --------------------------------------------------------------------------------
  // Class: mx_forum
--- 100,103 ----
***************
*** 1621,1625 ****
  	// Main method
  	//
! 	function read_file($phpbb_file, $sub_call = false)
  	{
  		global $phpbb_root_path, $mx_root_path, $phpEx, $template, $HTTP_POST_VARS, $HTTP_POST_FILES, $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $db, $userdata, $mode, $theme, $lang, $table_prefix, $mx_table_prefix, $board_config, $portal_config;
--- 1614,1618 ----
  	// Main method
  	//
! 	function read_file( $phpbb_file, $sub_call = false )
  	{
  		global $phpbb_root_path, $mx_root_path, $phpEx, $template, $HTTP_POST_VARS, $HTTP_POST_FILES, $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $db, $userdata, $mode, $theme, $lang, $table_prefix, $mx_table_prefix, $board_config, $portal_config;
***************
*** 1635,1639 ****
  			global $cash, $cm_groups; // allways used globally by cash mod
  
! 			switch ($phpbb_file)
  			{
  				case 'memberlist':
--- 1628,1632 ----
  			global $cash, $cm_groups; // allways used globally by cash mod
  
! 			switch ( $phpbb_file )
  			{
  				case 'memberlist':
***************
*** 1654,1664 ****
  					break;
  			}
- 			
- 			//From phpBB2 common.php
- 			//
- 			// [Remove?] No! since we don't include phpBB2 common.php :)
- 			// This code is already present below for subcalls of includes.
- 			//
- 			//$this->read_file('functions_cash', true);
  		}
  
--- 1647,1650 ----
***************
*** 1685,1689 ****
  		//
  		$code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code);
! 		
  		if (!defined('IN_CASHMOD'))
  		{
--- 1671,1675 ----
  		//
  		$code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code);
! 
  		if (!defined('IN_CASHMOD'))
  		{
***************
*** 1730,1741 ****
  		//
  		$code = preg_replace ("/include(.*)functions\./", "//", $code);
! 		//$code = preg_replace ("/include(.*)functions_select\./", "//", $code); //This does not work and profile/register will be blank again
! 		//$code = preg_replace ("/include(.*)functions_post\./", "//", $code); //This does not work and profile/register will be blank again
! 		//$code = preg_replace ("/include(.*)bbcode\./", "//", $code); //This does not work and profile/register will be blank again
! 		//$code = preg_replace ("/include(.*)auth\./", "//", $code); //This does not work and profile/register will be blank again
! 		$code = preg_replace ("/include(.*)functions_select/", "//", $code);
! 		$code = preg_replace ("/include(.*)functions_post/", "//", $code);
! 		$code = preg_replace ("/include(.*)bbcode/", "//", $code);
! 		$code = preg_replace ("/include(.*)auth/", "//", $code);
  
  		//
--- 1716,1723 ----
  		//
  		$code = preg_replace ("/include(.*)functions\./", "//", $code);
! 		$code = preg_replace ("/include(.*)functions_select\./", "//", $code);
! 		$code = preg_replace ("/include(.*)functions_post\./", "//", $code);
! 		$code = preg_replace ("/include(.*)bbcode\./", "//", $code);
! 		$code = preg_replace ("/include(.*)auth\./", "//", $code);
  
  		//