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

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

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

Modified Files:
	mx_module_defs.php 
Log Message:
- fixing the html textblock
- fixing blockCP textblock preview

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mx_module_defs.php	23 Oct 2005 18:48:21 -0000	1.9
--- mx_module_defs.php	14 Dec 2005 14:49:20 -0000	1.10
***************
*** 230,234 ****
  			
  			// To sync script and textarea select field
! 			'SELECT_NAME' =>  $parameter_data['parameter_name'],					
  		));
  				
--- 230,236 ----
  			
  			// To sync script and textarea select field
! 			'SELECT_NAME' =>  $parameter_data['parameter_name'],
! 
! 			'TEXTAREA_BBCODES_XTRA' => $bbcode_on ? 'onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);"' : '',		
  		));
  				
***************
*** 338,342 ****
  
  			// To sync script and textarea select field
! 			'SELECT_NAME' =>  $parameter_data['parameter_name'],			
  		));
  
--- 340,346 ----
  
  			// To sync script and textarea select field
! 			'SELECT_NAME' =>  $parameter_data['parameter_name'],
! 
! 			'TEXTAREA_BBCODES_XTRA' => $bbcode_on ? 'onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);"' : '',		
  		));
  
***************
*** 358,368 ****
  		$parameter_value = $parameter_data['parameter_value'];
  
  		//
  		// HTML, BBCode & Smilies toggle selection
  		//
! 		$html_status = ( true ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
! 		$bbcode_status = ( false ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
! 		$smilies_status = ( false ) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
  
  		$template->set_filenames(array(
  			'parameter' => 'admin/mx_module_parameters.tpl')
--- 362,384 ----
  		$parameter_value = $parameter_data['parameter_value'];
  
+ 		// Extract customized textblock settings
+ 		$bbcode_on = false;
+ 		$html_on = true;
+ 		$smilies_on = false;	
+ 		$board_config['allow_html_tags'] = '';
+ 				
  		//
  		// HTML, BBCode & Smilies toggle selection
  		//
! 		$html_status = ( $html_on ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
! 		$bbcode_status = ( $bbcode_on ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
! 		$smilies_status = ( $smilies_on ) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
  
+ 		if ( isset($HTTP_POST_VARS['preview']) )
+ 		{
+ 			$this->preview($parameter_value, $html_on, $bbcode_on, $smilies_on, true);
+ 			$template->assign_block_vars('preview', array());
+ 		}
+ 				
  		$template->set_filenames(array(
  			'parameter' => 'admin/mx_module_parameters.tpl')
***************
*** 419,423 ****
  	// Preview Textblock
  	// ===================================================
! 	function preview($text, $html_on, $bbcode_on, $smilies_on)
  	{
  		global $board_config, $template, $lang;
--- 435,439 ----
  	// Preview Textblock
  	// ===================================================
! 	function preview($text, $html_on, $bbcode_on, $smilies_on, $is_html_textblock = false)
  	{
  		global $board_config, $template, $lang;
***************
*** 428,434 ****
  		$replacement_word = array();
  		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 )
--- 444,453 ----
  		$replacement_word = array();
  		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 )