[mxbb-commits] mx_phpbb/includes forum_hack.php,1.59,1.60

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

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

Modified Files:
	forum_hack.php 
Log Message:
related...

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** forum_hack.php	15 Jun 2008 21:05:25 -0000	1.59
--- forum_hack.php	13 Jul 2008 19:36:42 -0000	1.60
***************
*** 792,796 ****
  	function session_reset_keys($user_id, $user_ip)
  	{
! 		global $db, $userdata, $board_config;
  
  		$key_sql = ($user_id == $userdata['user_id'] && !empty($userdata['session_key'])) ? "AND key_id != '" . md5($userdata['session_key']) . "'" : '';
--- 792,796 ----
  	function session_reset_keys($user_id, $user_ip)
  	{
! 		global $db, $userdata, $board_config, $mx_backend;
  
  		$key_sql = ($user_id == $userdata['user_id'] && !empty($userdata['session_key'])) ? "AND key_id != '" . md5($userdata['session_key']) . "'" : '';
***************
*** 816,820 ****
  		if ( !empty($key_sql) )
  		{
! 			$auto_login_key = mx_dss_rand() . mx_dss_rand();
  
  			$current_time = time();
--- 816,820 ----
  		if ( !empty($key_sql) )
  		{
! 			$auto_login_key = $mx_backend->dss_rand() . $mx_backend->dss_rand();
  
  			$current_time = time();
***************
*** 946,949 ****
--- 946,950 ----
  	function make_jumpbox($action, $match_forum_id = 0)
  	{
+ 		global $mx_backend;
  		//
  		// Replaces same function in function.php
***************
*** 951,955 ****
  		//make_jumpbox( $this->phpbb_url . $action, $match_forum_id );
  
! 		phpBB2::make_jumpbox($this->phpbb_url . $action, $match_forum_id);
  	}
  
--- 952,956 ----
  		//make_jumpbox( $this->phpbb_url . $action, $match_forum_id );
  
! 		$mx_backend->make_jumpbox($this->phpbb_url . $action, $match_forum_id);
  	}
  
***************
*** 1109,1112 ****
--- 1110,1114 ----
  	function smilies_pass($message)
  	{
+ 		global $mx_bbcode;
  		//
  		// Replaces same function in bbcode.php
***************
*** 1115,1119 ****
  		//$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;
--- 1117,1121 ----
  		//$smilies_path = $board_config['smilies_path'];
  		//$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		$message = $mx_bbcode->smilies_pass( $message );
  		//$board_config['smilies_path'] = $smilies_path;
  		return $message;
***************
*** 1128,1135 ****
  		// Replaces same function in functions_post.php
  		//
! 		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" ) ) );
--- 1130,1137 ----
  		// Replaces same function in functions_post.php
  		//
! 		global $board_config, $template, $phpEx, $mx_bbcode;
  		//$smilies_path = $board_config['smilies_path'];
  		//$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		$mx_bbcode->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" ) ) );