[mxbb-commits] mx_phpbb/includes forum_hack.php,1.32,1.33

[OryNider <ory...@us...>]

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

Modified Files:
	forum_hack.php 
Log Message:
added more phpBB:: to some functions and this may fix it for phpBB2 backend

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** forum_hack.php	10 Feb 2008 02:01:01 -0000	1.32
--- forum_hack.php	11 Feb 2008 22:46:05 -0000	1.33
***************
*** 35,39 ****
  include_once($phpbb_root_path . 'includes/auth.' . $phpEx);
  
! if(!function_exists(create_date))
  {
  	function create_date($format, $gmepoch, $tz)
--- 35,39 ----
  include_once($phpbb_root_path . 'includes/auth.' . $phpEx);
  
! if(!function_exists('create_date'))
  {
  	function create_date($format, $gmepoch, $tz)
***************
*** 43,47 ****
  }
  
! if(!function_exists(get_db_stat))
  {
  	function get_db_stat($mode)
--- 43,47 ----
  }
  
! if(!function_exists('get_db_stat'))
  {
  	function get_db_stat($mode)
***************
*** 56,60 ****
  	define('IN_CASHMOD', true);
  	
! 	if ( !file_exists(@phpbb_realpath($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_cash.'.$phpEx)) )
  	{
  		include_once($phpbb_root_path . 'language/lang_english/lang_cash.' . $phpEx);
--- 56,60 ----
  	define('IN_CASHMOD', true);
  	
! 	if ( !file_exists(phpBB2::phpbb_realpath($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_cash.'.$phpEx)) )
  	{
  		include_once($phpbb_root_path . 'language/lang_english/lang_cash.' . $phpEx);
***************
*** 709,713 ****
  		// Replaces same function in sessions.php
  		//
! 		return append_sid( $this->full_url( $url, $non_html_amp, $portal_url ), $non_html_amp );
  	}
  
--- 709,713 ----
  		// Replaces same function in sessions.php
  		//
! 		return mx_append_sid( $this->full_url( $url, $non_html_amp, $portal_url ), $non_html_amp );
  	}
  
***************
*** 967,975 ****
  		// Replaces same function in bbcode.php
  		//
! 		global $board_config;
! 		$smilies_path = $board_config['smilies_path'];
! 		$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		$message = smilies_pass( $message );
! 		$board_config['smilies_path'] = $smilies_path;
  		return $message;
  	}
--- 967,975 ----
  		// Replaces same function in bbcode.php
  		//
! 		//global $board_config;
! 		//$smilies_path = $board_config['smilies_path'];
! 		//$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		$message = mx_smilies_pass( $message );
! 		//$board_config['smilies_path'] = $smilies_path;
  		return $message;
  	}
***************
*** 984,991 ****
  		//
  		global $board_config, $template, $phpEx;
! 		$smilies_path = $board_config['smilies_path'];
! 		$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		generate_smilies( $mode, $page_id );
! 		$board_config['smilies_path'] = $smilies_path;
  		$template->assign_vars( array( 'U_MORE_SMILIES' => $this->append_sid( "posting.$phpEx?mode=smilies" ) ) );
  	}
--- 984,991 ----
  		//
  		global $board_config, $template, $phpEx;
! 		//$smilies_path = $board_config['smilies_path'];
! 		//$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		mx_generate_smilies( $mode, $page_id );
! 		//$board_config['smilies_path'] = $smilies_path;
  		$template->assign_vars( array( 'U_MORE_SMILIES' => $this->append_sid( "posting.$phpEx?mode=smilies" ) ) );
  	}
***************
*** 1578,1581 ****
--- 1578,1582 ----
  		// Replace common phpBB functions with mxBB alternatives
  		//
+ 		//$code = str_replace('append_sid(', 'mx_append_sid(', $code);
  		$code = str_replace('append_sid(', '$mx_forum->append_sid(', $code);
  		//$code = str_replace('@phpbb_realpath(', '$mx_forum->phpbb_realpath(', $code);
***************
*** 1584,1587 ****
--- 1585,1589 ----
  		//$code = str_replace('is_link(', '$mx_forum->is_link(', $code);
  		$code = str_replace('redirect(', '$mx_forum->redirect(', $code);
+ 		//$code = str_replace('redirect(', 'mx_redirect(', $code);
  		$code = str_replace('make_jumpbox(', '$mx_forum->make_jumpbox(', $code);
  		$code = str_replace('make_jumpbox_ref(', '$mx_forum->make_jumpbox_ref(', $code);
***************
*** 1711,1720 ****
  				break;
  		}
- 
  		
  		//this funtions are now in funtion container
! 		$code = str_replace('get_db_stat', 'phpBB2::get_db_stat', $code);
! 		$code = str_replace('create_date', 'phpBB2::create_date', $code);
  		$code = str_replace('phpbb_clean_username(', 'phpBB2::phpbb_clean_username(', $code);
  		
  		//
--- 1713,1724 ----
  				break;
  		}
  		
  		//this funtions are now in funtion container
! 		$code = str_replace('get_db_stat(', 'phpBB2::get_db_stat(', $code);
! 		$code = str_replace('create_date(', 'phpBB2::create_date(', $code);
  		$code = str_replace('phpbb_clean_username(', 'phpBB2::phpbb_clean_username(', $code);
+ 		$code = str_replace('phpbb_realpath(', 'phpBB2::phpbb_realpath(', $code);
+ 		$code = str_replace('get_userdata(', 'mx_get_userdata(', $code);
+ 		$code = str_replace('dss_rand(', 'mx_dss_rand(', $code);
  		
  		//