[mxbb-commits] core/modules/mx_textblocks/admin mx_module_defs.php,1.10,1.11

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

Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9316/modules/mx_textblocks/admin

Modified Files:
	mx_module_defs.php 
Log Message:
a couple of commits - sprung from last day's intense bugtracking at mxbb-portal.com. be prepaired for more tonight.

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mx_module_defs.php	14 Dec 2005 14:49:20 -0000	1.10
--- mx_module_defs.php	16 Dec 2005 18:58:45 -0000	1.11
***************
*** 78,82 ****
  				$html_on = $parameter_opt['allow_html'] ? true : true;
  				$smilies_on = $parameter_opt['allow_smilies'] ? true : true;
! 				//$board_config['allow_html_tags'] = $parameter_opt['allow_html_tags'];
  				
  				if( $bbcode_on )
--- 78,85 ----
  				$html_on = $parameter_opt['allow_html'] ? true : true;
  				$smilies_on = $parameter_opt['allow_smilies'] ? true : true;
! 				
! 				// Remove allowed html tags
! 				$html_entities_match = array();
! 				$html_entities_replace = array();
  				
  				if( $bbcode_on )
***************
*** 89,96 ****
  				$bbcode_on = false;
  				$html_on = true;
! 				$smilies_on = false;			
  				$html_entities_match = array();
  				$html_entities_replace = array();			
! 				$bbcode_uid = 0;
  			
  				break;						
--- 92,102 ----
  				$bbcode_on = false;
  				$html_on = true;
! 				$smilies_on = false;	
! 				$bbcode_uid = 0;
! 				
! 				// Remove allowed html tags		
  				$html_entities_match = array();
  				$html_entities_replace = array();			
! 				
  			
  				break;						
***************
*** 247,251 ****
  	function display_edit_CustomizedTextBlock( $block_id, $parameter_id, $parameter_data )
  	{
! 		global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpEx, $mx_table_prefix, $table_prefix;
  		global $HTTP_POST_VARS;
  
--- 253,257 ----
  	function display_edit_CustomizedTextBlock( $block_id, $parameter_id, $parameter_data )
  	{
! 		global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace;
  		global $HTTP_POST_VARS;
  
***************
*** 256,260 ****
  		$html_on = true? true : false;
  		$smilies_on = true? true : false;	
! 		$board_config['allow_html_tags'] = '';
  		$bbcode_uid = $parameter_data['parameter_opt'];
  
--- 262,270 ----
  		$html_on = true? true : false;
  		$smilies_on = true? true : false;	
! 
! 		// Remove allowed html tags
! 		$html_entities_match = array();
! 		$html_entities_replace = array();
! 
  		$bbcode_uid = $parameter_data['parameter_opt'];
  
***************
*** 357,361 ****
  	function display_edit_WysiwygTextBlock( $block_id, $parameter_id, $parameter_data )
  	{
! 		global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpEx, $mx_table_prefix, $table_prefix;
  		global $HTTP_POST_VARS;
  
--- 367,371 ----
  	function display_edit_WysiwygTextBlock( $block_id, $parameter_id, $parameter_data )
  	{
! 		global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace;
  		global $HTTP_POST_VARS;
  
***************
*** 366,370 ****
  		$html_on = true;
  		$smilies_on = false;	
! 		$board_config['allow_html_tags'] = '';
  				
  		//
--- 376,383 ----
  		$html_on = true;
  		$smilies_on = false;	
! 		
! 		// Remove allowed html tags
! 		$html_entities_match = array();
! 		$html_entities_replace = array();
  				
  		//
***************
*** 437,441 ****
  	function preview($text, $html_on, $bbcode_on, $smilies_on, $is_html_textblock = false)
  	{
! 		global $board_config, $template, $lang;
  
  		$preview_text = $text;
--- 450,454 ----
  	function preview($text, $html_on, $bbcode_on, $smilies_on, $is_html_textblock = false)
  	{
! 		global $board_config, $template, $lang, $html_entities_match, $html_entities_replace;
  
  		$preview_text = $text;
***************
*** 445,453 ****
  		obtain_word_list($orig_word, $replacement_word);
  		
! 		if (!$is_html_textblock)
! 		{
! 			$bbcode_uid = ( $bbcode_on ) ? make_bbcode_uid() : '';
! 			$preview_text = stripslashes(prepare_message(addslashes(unprepare_message($preview_text)), $html_on, $bbcode_on, $smilies_on, $bbcode_uid));
! 		}
  		
  		if( $bbcode_on )
--- 458,463 ----
  		obtain_word_list($orig_word, $replacement_word);
  		
! 		$bbcode_uid = ( $bbcode_on ) ? make_bbcode_uid() : '';
! 		$preview_text = stripslashes(prepare_message(addslashes(unprepare_message($preview_text)), $html_on, $bbcode_on, $smilies_on, $bbcode_uid));
  		
  		if( $bbcode_on )