[mxbb-commits] mx_phpbb/includes forum_hack.php, 1.28, 1.29 phpbb_constants.php, 1.6, 1.7 phpbb_def

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-serv3724/includes

Modified Files:
	forum_hack.php phpbb_constants.php phpbb_defs.php 
	phpbb_footer.php 
Log Message:
some fixes :)

Index: phpbb_footer.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/phpbb_footer.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** phpbb_footer.php	5 Apr 2006 22:36:12 -0000	1.4
--- phpbb_footer.php	8 Feb 2008 04:26:20 -0000	1.5
***************
*** 2,13 ****
  /**
  *
! * @package mxBB Portal Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
  */
  
! if ( !defined( 'IN_PORTAL' ) )
  {
  	die( "Hacking attempt" );
--- 2,13 ----
  /**
  *
! * @package Mx-Publisher Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] Mx-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
  */
  
! if ( !defined('IN_PORTAL') )
  {
  	die( "Hacking attempt" );

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** forum_hack.php	4 Feb 2008 23:42:18 -0000	1.28
--- forum_hack.php	8 Feb 2008 04:26:20 -0000	1.29
***************
*** 2,8 ****
  /**
  *
! * @package mxBB Portal Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
--- 2,8 ----
  /**
  *
! * @package Mx-Publisher Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] Mx-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
***************
*** 32,36 ****
  
  include_once($mx_root_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx);
! include_once($mx_root_path . 'includes/sessions/phpbb2/auth.' . $phpEx);
  
  //Check for cash mod
--- 32,53 ----
  
  include_once($mx_root_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx);
! 
! include_once($phpbb_root_path . 'includes/auth.' . $phpEx);
! 
! if(!function_exists(create_date))
! {
! 	function create_date($format, $gmepoch, $tz)
! 	{
! 		return phpBB2::create_date($format, $gmepoch, $tz);
! 	}
! }
! 
! if(!function_exists(get_db_stat))
! {
! 	function get_db_stat($mode)
! 	{
! 		return phpBB2::get_db_stat($mode);
! 	}
! }
  
  //Check for cash mod
***************
*** 419,423 ****
  
  		//
! 		// Redirect phpBB login calls to mxBB
  		//
  		if ($script_name == 'login')
--- 436,440 ----
  
  		//
! 		// Redirect phpBB login calls to Mx-Publisher
  		//
  		if ($script_name == 'login')
***************
*** 646,650 ****
  				$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'],
--- 663,667 ----
  				$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'],
***************
*** 1270,1274 ****
  				'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'],
--- 1287,1291 ----
  				'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'],
***************
*** 1346,1354 ****
  			// 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);
--- 1363,1371 ----
  			// Commment out the main includes
  			//
! 			$cashcode = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// Mx-Publisher: Removed include extension.inc' . "\n", $cashcode);
! 			$cashcode = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// Mx-Publisher: Removed include common.php' . "\n", $cashcode);
  
  			//
! 			// Remove some includes already included by Mx-Publisher
  			//
  			$cashcode = preg_replace ("/include(.*)bbcode/", "//", $cashcode);
***************
*** 1358,1362 ****
  			// 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);
  
  			//
--- 1375,1379 ----
  			// NOTE: This regex will only work if "global" is stated on a new line...
  			//
! 			//$cashcode = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// Mx-Publisher rewrite of global, to instance $this in this function' . "\n " . 'global $phpbb_root_path, \\3', $cashcode);
  
  			//
***************
*** 1385,1389 ****
  		// Remove def of IN_PHPBB
  		//
! 		$code = preg_replace('#^(.?define).*(IN_PHPBB).*(\r\n?|\n)#m','// mxBB: Removed IN_PHPBB def' . "\n", $code);
  
  		//
--- 1402,1406 ----
  		// Remove def of IN_PHPBB
  		//
! 		$code = preg_replace('#^(.?define).*(IN_PHPBB).*(\r\n?|\n)#m','// Mx-Publisher: Removed IN_PHPBB def' . "\n", $code);
  
  		//
***************
*** 1401,1406 ****
  		// Commment out the main includes
  		//
! 		$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);
  
  
--- 1418,1423 ----
  		// Commment out the main includes
  		//
! 		$code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// Mx-Publisher: Removed include extension.inc' . "\n", $code);
! 		$code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// Mx-Publisher: Removed include common.php' . "\n", $code);
  
  
***************
*** 1408,1413 ****
  		// Commment out the page_header and page_tail includes
  		//
! 		$code = preg_replace('#^(.?).*(include).*(page_header).*(\r\n?|\n)#m','// mxBB: Removed include page_header.php' . "\n", $code);
! 		$code = preg_replace('#^(.?).*(include).*(page_tail).*(\r\n?|\n)#m',"// mxBB: Removed include page_tail.php" . "\n" . 'return;' . "\n", $code);
  
  
--- 1425,1430 ----
  		// Commment out the page_header and page_tail includes
  		//
! 		$code = preg_replace('#^(.?).*(include).*(page_header).*(\r\n?|\n)#m','// Mx-Publisher: Removed include page_header.php' . "\n", $code);
! 		$code = preg_replace('#^(.?).*(include).*(page_tail).*(\r\n?|\n)#m',"// Mx-Publisher: Removed include page_tail.php" . "\n" . 'return;' . "\n", $code);
  
  
***************
*** 1419,1423 ****
  
  		//
! 		// Replace common phpBB functions with mxBB alternatives
  		//
  		$code = str_replace('append_sid(', '$mx_forum->append_sid(', $code);
--- 1436,1440 ----
  
  		//
! 		// Replace common phpBB functions with Mx-Publisher alternatives
  		//
  		$code = str_replace('append_sid(', '$mx_forum->append_sid(', $code);
***************
*** 1436,1440 ****
  
  		//
! 		// Remove some includes already included by mxBB
  		//
  		$code = preg_replace ("/include(.*)functions_select/", "//", $code);
--- 1453,1457 ----
  
  		//
! 		// Remove some includes already included by Mx-Publisher
  		//
  		$code = preg_replace ("/include(.*)functions_select/", "//", $code);
***************
*** 1447,1451 ****
  		// NOTE: This regex will only work if "global" is stated on a new line...
  		//
! 		$code = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// mxBB rewrite of global, to instance $this in this function' . "\n " . 'global $mx_forum, \\3', $code);
  
  		//
--- 1464,1468 ----
  		// NOTE: This regex will only work if "global" is stated on a new line...
  		//
! 		$code = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// Mx-Publisher rewrite of global, to instance $this in this function' . "\n " . 'global $mx_forum, \\3', $code);
  
  		//
***************
*** 1547,1553 ****
--- 1564,1573 ----
  				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);
+ 		*/
  
  		//

Index: phpbb_defs.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/phpbb_defs.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** phpbb_defs.php	17 Jun 2006 20:14:00 -0000	1.4
--- phpbb_defs.php	8 Feb 2008 04:26:20 -0000	1.5
***************
*** 2,8 ****
  /**
  *
! * @package mxBB Portal Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
--- 2,8 ----
  /**
  *
! * @package Mx-Publisher Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] Mx-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *

Index: phpbb_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/phpbb_constants.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** phpbb_constants.php	9 Sep 2007 20:19:43 -0000	1.6
--- phpbb_constants.php	8 Feb 2008 04:26:20 -0000	1.7
***************
*** 2,8 ****
  /**
  *
! * @package mxBB Portal Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
--- 2,8 ----
  /**
  *
! * @package Mx-Publisher Module - mx_phpbb
  * @version $Id$
! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] Mx-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
***************
*** 16,20 ****
  if ( PORTAL_BACKEND != 'phpbb2' )
  {
! 	mx_message_die(GENERAL_MESSAGE, 'There are blocks on this page designed for mxBB 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.');
  }
  
***************
*** 37,41 ****
  {
  	// ----------
! 	$current_template_images = $module_root_path . "templates/" . "subSilver" . "/images" ;
  	// ----------
  }
--- 37,41 ----
  {
  	// ----------
! 	$current_template_images = $module_root_path . "templates/" . "_core" . "/images" ;
  	// ----------
  }
***************
*** 58,62 ****
  if (is_object($mx_page))
  {
! 	$mx_page->add_copyright( 'mxBB phpBB Module' );
  }
  
--- 58,62 ----
  if (is_object($mx_page))
  {
! 	$mx_page->add_copyright( 'Mx-Publisher phpBB Module' );
  }

[mxbb-commits] mx_phpbb/includes forum_hack.php, 1.28, 1.29 phpbb_constants.php, 1.6, 1.7 phpbb_def

[mxbb-commits] mx_phpbb/includes forum_hack.php, 1.28, 1.29 phpbb_constants.php, 1.6, 1.7 phpbb_defs.php, 1.4, 1.5 phpbb_footer.php, 1.4, 1.5