[mxbb-commits] mx_phpbb mx_phpbb.php,1.15,1.16

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

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

Modified Files:
	mx_phpbb.php 
Log Message:
Reviewed, according to team discussion.

Index: mx_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/mx_phpbb.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mx_phpbb.php	18 Feb 2008 18:37:13 -0000	1.15
--- mx_phpbb.php	19 Feb 2008 21:39:46 -0000	1.16
***************
*** 14,17 ****
--- 14,22 ----
  }
  
+ 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.');
+ }
+ 
  //
  // View Permissions
***************
*** 69,81 ****
  include_once($mx_root_path . "modules/mx_phpbb/includes/phpbb_constants.$phpEx");
  
! /*
! if ((@include $mx_root_path . "includes/shared/phpbb2/language/lang_" . $default_lang . "/lang_main.$phpEx") === false)
  {
! 	if ((@include $mx_root_path . "includes/shared/phpbb2/language/lang_english/lang_main.$phpEx") === false)
! 	{
! 			die('Language file ' . $mx_root_path . "includes/shared/phpbb2/language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.');
! 	}
  }
- */
  
  //
--- 74,92 ----
  include_once($mx_root_path . "modules/mx_phpbb/includes/phpbb_constants.$phpEx");
  
! //
! // For core 2.9.x+
! //
! if (file_exists( $mx_root_path . "includes/shared/phpbb2/language/lang_" . $default_lang . "/lang_main.$phpEx"))
  {
! 	@include($mx_root_path . "includes/shared/phpbb2/language/lang_english/lang_main.$phpEx");
! }
! else if (file_exists( $mx_root_path . "includes/shared/phpbb2/language/lang_english/lang_main.$phpEx"))
! {
! 	@include($mx_root_path . "includes/shared/phpbb2/language/lang_english/lang_main.$phpEx");
! }
! else
! {
! 	// Do nothing, since langs have alrady been loaded ;)
  }
  
  //
***************
*** 126,130 ****
--- 137,145 ----
  $phpbb_output = str_replace('"templates/'.$theme['template_name'], '"' . $phpbb_root_path . 'templates/'.$theme['template_name'], $phpbb_output);
  
+ //
+ // Debug output of html, before sending to mxp block
+ //
  //die(str_replace("\n", '<br>', htmlspecialchars($phpbb_output)));
+ 
  echo($phpbb_output);
  unset($phpbb_output);