[mxbb-commits] mx_phpbb/includes forum_hack.php,1.25,1.26

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	forum_hack.php 
Log Message:
avatar and cash :)

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** forum_hack.php	9 Sep 2007 20:19:43 -0000	1.25
--- forum_hack.php	13 Jan 2008 21:38:57 -0000	1.26
***************
*** 21,40 ****
  define( 'MX_FORUM_DEBUG', 1 );
  
! include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
! if (!function_exists('language_select'))
! {
! 	include_once($phpbb_root_path . 'includes/functions_selects.' . $phpEx);
! }
! if (!function_exists('prepare_message'))
! {
! 	include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx);
! }
! if (!function_exists('bbencode_second_pass'))
! {
! 	include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
  }
! if (!function_exists('auth_check_user'))
  {
! 	include_once($phpbb_root_path . 'includes/auth.' . $phpEx);
  }
  
--- 21,49 ----
  define( 'MX_FORUM_DEBUG', 1 );
  
! include_once($phpbb_root_path . 'includes/functions_selects.' . $phpEx);
! include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx);
! 
! //Check for mx_smartor fap version
! if (file_exists($mx_root_path . 'modules/mx_smartor/album_mod/album_bbconstants.' . $phpEx)) 
! { 
! 	include_once($mx_root_path . 'modules/mx_smartor/album_mod/album_bbconstants.' . $phpEx);
  }
! 
! include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
! include_once($phpbb_root_path . 'includes/auth.' . $phpEx);
! 
! //Check for cash mod
! if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) 
  {
! 	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);
! 	}
! 	else
! 	{
! 		include_once($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_cash.' . $phpEx);
! 	}		
  }
  
***************
*** 156,160 ****
  	function init_paths()
  	{
! 		global $mx_root_path, $db, $phpEx, $board_config;
  
  		if ( defined( PHPBB_URL ) && defined( PORTAL_URL ) )
--- 165,169 ----
  	function init_paths()
  	{
! 		global $mx_root_path, $db, $phpEx;
  
  		if ( defined( PHPBB_URL ) && defined( PORTAL_URL ) )
***************
*** 175,193 ****
  			{
  				$row = $db->sql_fetchrow( $result );
! 
! 				//
! 				// Define some general Defs
! 				//
! 				$script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($row['script_path']));
! 				$server_name = trim($row['server_name']);
! 				$server_protocol = ( $row['cookie_secure'] ) ? 'https://' : 'http://';
! 				$server_port = ( $row['server_port'] <> 80 ) ? ':' . trim($row['server_port']) . '/' : '/';
! 				$server_url = $server_protocol . $server_name . $server_port . $script_name;
! 
! 				$script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/';
! 				$server_url_phpbb = $server_protocol . $server_name . $server_port . $script_name_phpbb;
! 
! 				$this->phpbb_url = $server_url_phpbb;
! 				$this->portal_url = $server_url;
  			}
  			$db->sql_freeresult($result);
--- 184,189 ----
  			{
  				$row = $db->sql_fetchrow( $result );
! 				$this->phpbb_url = $row['portal_phpbb_url'];
! 				$this->portal_url = $row['portal_url'];
  			}
  			$db->sql_freeresult($result);
***************
*** 348,351 ****
--- 344,348 ----
  			'search' => $this->phpbb_config['search'],
  			'viewonline' => $this->phpbb_config['viewonline'],
+ 			'cash' => $this->phpbb_config['other'],
  			'other' => $this->phpbb_config['other'],
  		);
***************
*** 372,376 ****
  				'viewforum' => 0,
  				'viewonline' => 0,
! 				'viewtopic' => 0
  				);
  		}
--- 369,374 ----
  				'viewforum' => 0,
  				'viewonline' => 0,
! 				'viewtopic' => 0,
! 				'cash' => 0
  				);
  		}
***************
*** 644,652 ****
  		{
  			case 'index':
! 				//global $s_last_visit; // declared here: includes/page_header.php
! 				$s_last_visit = ( $userdata['session_logged_in'] ) ? phpBB2::create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : '';
  				$script_vars = array(
  					'LAST_VISIT_DATE' => sprintf( $lang['You_last_visit'], $s_last_visit ),
! 					'CURRENT_TIME' => sprintf( $lang['Current_time'], phpBB2::create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ),
  					'L_SEARCH_NEW' => $lang['Search_new'],
  					'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'],
--- 642,649 ----
  		{
  			case 'index':
! 				global $s_last_visit; // declared here: includes/page_header.php
  				$script_vars = array(
  					'LAST_VISIT_DATE' => sprintf( $lang['You_last_visit'], $s_last_visit ),
! 					'CURRENT_TIME' => sprintf( $lang['Current_time'], create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ),
  					'L_SEARCH_NEW' => $lang['Search_new'],
  					'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'],
***************
*** 657,661 ****
  					'L_AUTO_LOGIN' => $lang['Log_me_in'],
  					'L_LOGIN_LOGOUT' => $lang['Login'],
! 					'S_LOGIN_ACTION' => mx_append_sid('login.'.$phpEx)
  					);
  				//
--- 654,658 ----
  					'L_AUTO_LOGIN' => $lang['Log_me_in'],
  					'L_LOGIN_LOGOUT' => $lang['Login'],
! 					'S_LOGIN_ACTION' => append_sid('login.'.$phpEx)
  					);
  				//
***************
*** 694,698 ****
  		// Replaces same function in sessions.php
  		//
! 		return mx_append_sid( $this->full_url( $url, $non_html_amp, $portal_url ), $non_html_amp );
  	}
  
--- 691,695 ----
  		// Replaces same function in sessions.php
  		//
! 		return append_sid( $this->full_url( $url, $non_html_amp, $portal_url ), $non_html_amp );
  	}
  
***************
*** 1272,1276 ****
  				'TOTAL_USERS_ONLINE' => $l_online_users,
  				'LOGGED_IN_USER_LIST' => $online_userlist,
! 				'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], phpBB2::create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])),
  
  				'L_WHO_IS_ONLINE' => $lang['Who_is_Online'],
--- 1269,1273 ----
  				'TOTAL_USERS_ONLINE' => $l_online_users,
  				'LOGGED_IN_USER_LIST' => $online_userlist,
! 				'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])),
  
  				'L_WHO_IS_ONLINE' => $lang['Who_is_Online'],
***************
*** 1313,1316 ****
--- 1310,1382 ----
  		global $server_url; // used globally by usercp_register.php
  
+ 		//Check for cash mod
+ 		if (defined('IN_CASHMOD')) 
+ 		{
+ 			global $cash, $cm_groups; // allways used globally by cash mod
+ 
+ 			switch ( $phpbb_file )
+ 			{
+ 				case 'memberlist':
+ 					define('CM_MEMBERLIST', true);
+ 					global $cm_memberlist;
+ 					break;
+ 				case 'posting':
+ 					define('CM_POSTING', true);
+ 					global $cm_posting;
+ 					break;
+ 				case 'viewtopic':
+ 					define('CM_VIEWTOPIC', true);
+ 					global $cm_viewtopic;
+ 					break;
+ 				case 'viewprofile':
+ 					define('CM_VIEWPROFILE', true);
+ 					global $cm_viewprofile;
+ 					break;
+ 			}
+ 			$cashcode=file_get_contents($phpbb_root_path . 'includes/functions_cash.'.$phpEx);
+ 
+ 			//
+ 			// Remove php tags
+ 			//
+ 			$cashcode = str_replace('<?php','',$cashcode);
+ 			$cashcode = str_replace('?>','',$cashcode);
+ 			
+ 			//
+ 			// Commment out the main includes
+ 			//
+ 			$cashcode = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $cashcode);
+ 			$cashcode = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// mxBB: Removed include common.php' . "\n", $cashcode);
+ 
+ 			//
+ 			// Remove some includes already included by mxBB
+ 			//
+ 			$cashcode = preg_replace ("/include(.*)bbcode/", "//", $cashcode);
+ 			$cashcode = preg_replace ("/include(.*)functions_post/", "//", $cashcode);
+ 
+ 			// 
+ 			// NOTE: This regex will only work if "global" is stated on a new line...
+ 			//
+ 			//$cashcode = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// mxBB rewrite of global, to instance $this in this function' . "\n " . 'global $phpbb_root_path, \\3', $cashcode);
+ 
+ 			//
+ 			// Rewrite the $template
+ 			//
+ 			$cashcode = preg_replace ("/$template = (.*)\;/", "$template = '" . $template . "';", $cashcode);
+ 
+ 
+ 			//
+ 			// Rewrite the phpbb_root_path
+ 			//
+ 			$cashcode = preg_replace ("/phpbb_root_path = (.*)\;/", "phpbb_root_path = '" . $phpbb_root_path . "';", $cashcode);
+ 
+ 			
+ 			//
+ 			// Add the phpbb_root_path to the append_sid function - if not already there
+ 			//
+ 			//
+ 			$template = new mx_Template( $phpbb_root_path . 'templates/'. $theme['template_name'] );		
+ 			eval($cashcode);
+ 		}			
+ 
  		$code=file_get_contents($phpbb_root_path . $phpbb_file . ".$phpEx");
  
***************
*** 1393,1396 ****
--- 1459,1463 ----
  				$code = str_replace('$is_auth_ary[$forum_data[$i][\'forum_id\']][\'auth_view\']', '$is_auth_ary[$forum_data[$i][\'forum_id\']][\'auth_view\'] && $mx_forum->phpbb2_auth_cat($forum_data[$i][\'forum_id\'])', $code); // For phpBB 2.0.21 and later
  				$code = str_replace('$is_auth_ary[$forum_id][\'auth_view\']', '$is_auth_ary[$forum_id][\'auth_view\'] && $mx_forum->phpbb2_auth_cat($forum_data[$i][\'forum_id\'])', $code); // For phpBB 2.0.21 and later
+ 
  				// Hack for XS/Simple SubForum
  				$code = str_replace('$images = unserialize($item[\'FORUM_FOLDERS\'])', '$mx_forum->images = unserialize($item[\'FORUM_FOLDERS\'])', $code);
***************
*** 1411,1415 ****
  				$code = str_replace('$temp_url = "modcp.', '$temp_url = "' . $phpbb_root_path . 'modcp.', $code);
  				$code = str_replace('$temp_url = "posting.', '$temp_url = "' . $phpbb_root_path . 'posting.', $code);
! 
  				//
  				// Avatars and ranks
--- 1478,1482 ----
  				$code = str_replace('$temp_url = "modcp.', '$temp_url = "' . $phpbb_root_path . 'modcp.', $code);
  				$code = str_replace('$temp_url = "posting.', '$temp_url = "' . $phpbb_root_path . 'posting.', $code);
! 				
  				//
  				// Avatars and ranks
***************
*** 1447,1467 ****
  				// Avatars and ranks
  				//
! 				$code = str_replace('\'./\' . $board_config[\'avatar_gallery_path\']', '$board_config[\'avatar_gallery_path\']', $code);
! 				$code = str_replace('\'./\' . $board_config[\'avatar_path\']', '$board_config[\'avatar_path\']', $code);
  
! 				$code = str_replace('$board_config[\'avatar_gallery_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_gallery_path\']', $code);
! 				$code = str_replace('$board_config[\'avatar_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_path\']', $code);
  				break;
  
! 	         case 'includes/usercp_viewprofile':
! 	            //
! 	            // Avatars and ranks
! 	            //
! 	            $code = str_replace('\'./\' . $board_config[\'avatar_gallery_path\']', '$board_config[\'avatar_gallery_path\']', $code);
! 	            $code = str_replace('\'./\' . $board_config[\'avatar_path\']', '$board_config[\'avatar_path\']', $code);
! 
! 	            $code = str_replace('$board_config[\'avatar_gallery_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_gallery_path\']', $code);
! 	            $code = str_replace('$board_config[\'avatar_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_path\']', $code);
! 	            break;
  		}
  
--- 1514,1543 ----
  				// Avatars and ranks
  				//
! 				$code = str_replace( '\'./\' . $board_config[\'avatar_gallery_path\']', '$board_config[\'avatar_gallery_path\']', $code );
! 				$code = str_replace( '\'./\' . $board_config[\'avatar_path\']', '$board_config[\'avatar_path\']', $code );
!  
! 				$code = str_replace( '$board_config[\'avatar_gallery_path\']', '\'' . $phpbb_root_path . '\' . $board_config[\'avatar_gallery_path\']', $code );
! 				$code = str_replace( '$board_config[\'avatar_path\']', '\'' . $phpbb_root_path . '\' . $board_config[\'avatar_path\']', $code );
  
! 				$code = str_replace( '$error = true;', 'return;', $code);
! 				$code = str_replace( 'if (!is_uploaded_file($avatar_filename))', 'if (!file_exists($avatar_filename))', $code);
! 				$code = str_replace( '$move_file($avatar_filename, \'' . $phpbb_root_path .'\' . $board_config[\'avatar_path\'] . "/$new_filename");','$move_file($avatar_filename, \'' . $phpbb_root_path .'\' . $board_config[\'avatar_path\'] . "/$new_filename"); @unlink( $avatar_filename);', $code);
  				break;
+ 				
+ 			case 'includes/usercp_viewprofile': 
+ 				// 
+ 				// Avatars and ranks 
+ 				// 
+ 				$code = str_replace('\'./\' . $board_config[\'avatar_gallery_path\']', '$board_config[\'avatar_gallery_path\']', $code); 
+ 				$code = str_replace('\'./\' . $board_config[\'avatar_path\']', '$board_config[\'avatar_path\']', $code); 
  
! 				$code = str_replace('$board_config[\'avatar_gallery_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_gallery_path\']', $code); 
! 				$code = str_replace('$board_config[\'avatar_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_path\']', $code); 
! 				break;
! 				
! 			case 'cash':
! 			
! 				$code = str_replace('exit;', 'return;', $code);
! 				break;
  		}
  
***************
*** 1523,1526 ****
--- 1599,1612 ----
  	if ($mx_forum->phpbb_config['enable_module'])
  	{
+     if ( isset( $HTTP_POST_FILES ) && !empty( $HTTP_POST_FILES ) ) 
+     { 
+         $up_files_keys = array_keys( $HTTP_POST_FILES ); 
+         foreach( $up_files_keys as $up_file ) 
+         { 
+             @rename( $HTTP_POST_FILES[$up_file]['tmp_name'], $HTTP_POST_FILES[$up_file]['tmp_name'] . '.mxbb' ); 
+             $HTTP_POST_FILES[$up_file]['tmp_name'] .= '.mxbb'; 
+             $_FILES[$up_file]['tmp_name'] .= '.mxbb'; 
+         } 
+     }
  		$http_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
  		$http_server = preg_replace( '#^\/?(.*?)\/?$#', '\1', trim( $board_config['server_name'] ) );