[mxbb-commits] mx_phpbb/includes forum_hack.php, 1.46, 1.47 phpbb_constants.php, 1.7, 1.8

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

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

Modified Files:
	forum_hack.php phpbb_constants.php 
Log Message:
Updates, for cash

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** forum_hack.php	22 Feb 2008 19:21:08 -0000	1.46
--- forum_hack.php	22 Feb 2008 20:43:46 -0000	1.47
***************
*** 84,87 ****
--- 84,92 ----
  //Check for cash mod
  //
+ if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
+ {
+ 	define('IN_CASHMOD', true);
+ }
+ 
  /*
  if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx))
***************
*** 1647,1650 ****
--- 1652,1657 ----
  					break;
  			}
+ 
+ 			include_once($phpbb_root_path . 'includes/functions_cash.'.$phpEx);
  		}
  
***************
*** 1671,1683 ****
  		//
  		$code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code);
! 
! 		if (!defined('IN_CASHMOD'))
! 		{
! 			$code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// mxBB: Removed include common.php' . "\n", $code);
! 		}
! 		else
! 		{
! 			$code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','$mx_forum->read_file(\'includes/functions_cash\', true);' . "\n", $code);
! 		}
  
  		//
--- 1678,1682 ----
  		//
  		$code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code);
! 		$code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// mxBB: Removed include common.php' . "\n", $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);
  
  		//
--- 1715,1722 ----
  		//
  		$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);
  
  		//
***************
*** 1826,1830 ****
  				$code = preg_replace ("/phpbb_root_path = (.*)\;/", "phpbb_root_path = '" . $phpbb_root_path . "';", $code);
  				$code = preg_replace ("/$template = (.*)\;/", "$template = '" . $template . "';", $code);
! 				$template = new mx_Template($phpbb_root_path . 'templates/'. $theme['template_name']);
  				break;
  
--- 1825,1829 ----
  				$code = preg_replace ("/phpbb_root_path = (.*)\;/", "phpbb_root_path = '" . $phpbb_root_path . "';", $code);
  				$code = preg_replace ("/$template = (.*)\;/", "$template = '" . $template . "';", $code);
! 				$template = new Template_plus($phpbb_root_path . 'templates/'. $theme['template_name']);
  				break;
  

Index: phpbb_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/phpbb_constants.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** phpbb_constants.php	8 Feb 2008 04:26:20 -0000	1.7
--- phpbb_constants.php	22 Feb 2008 20:43:46 -0000	1.8
***************
*** 16,20 ****
  if ( PORTAL_BACKEND != 'phpbb2' )
  {
! 	mx_message_die(GENERAL_MESSAGE, 'There are blocks on this page designed for Mx-Publisher with phpBB2 backend, thus not compatible with current setup.');
  }
  
--- 16,20 ----
  if ( PORTAL_BACKEND != 'phpbb2' )
  {
! 	//mx_message_die(GENERAL_MESSAGE, 'There are blocks on this page designed for Mx-Publisher with phpBB2 backend, thus not compatible with current setup.');
  }