[mxbb-commits] mx_kb db_install.php,1.21,1.22 db_upgrade.php,1.14,1.15 kb.php,1.13,1.14

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

Update of /cvsroot/mxbb/mx_kb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25039/modules/mx_kb

Modified Files:
	db_install.php db_upgrade.php kb.php 
Log Message:
finally rewriting this module, once and for all

- rewritten post methods
- better security
- separated html. bbcode, smilies from phpbb
- wysiwyg support

Index: kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** kb.php	17 Mar 2005 12:37:24 -0000	1.13
--- kb.php	26 Mar 2005 22:52:35 -0000	1.14
***************
*** 131,161 ****
  include_once( $module_root_path . 'includes/functions_kb_auth.' . $phpEx );
  include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
! // echo(var_export($_SESSION['newssuite_'.$page_id]['testar']));
  $show_new = true;
- // options
- if ( !$board_config['allow_html'] )
- {
- 	$html_on = 0;
- }
- else
- {
- 	$html_on = ( $submit || $refresh ) ? ( ( !empty( $HTTP_POST_VARS['disable_html'] ) ) ? 0 : true ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_html'] : $userdata['user_allowhtml'] );
- }
- if ( !$board_config['allow_bbcode'] )
- {
- 	$bbcode_on = 0;
- }
- else
- {
- 	$bbcode_on = ( $submit || $refresh ) ? ( ( !empty( $HTTP_POST_VARS['disable_bbcode'] ) ) ? 0 : true ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_bbcode'] : $userdata['user_allowbbcode'] );
- }
- if ( !$board_config['allow_smilies'] )
- {
- 	$smilies_on = 0;
- }
- else
- {
- 	$smilies_on = ( $submit || $refresh ) ? ( ( !empty( $HTTP_POST_VARS['disable_smilies'] ) ) ? 0 : true ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_smilies'] : $userdata['user_allowsmile'] );
- }
  
  // page number
--- 131,136 ----
  include_once( $module_root_path . 'includes/functions_kb_auth.' . $phpEx );
  include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
! 
  $show_new = true;
  
  // page number
***************
*** 198,201 ****
--- 173,197 ----
  	}
  }
+ 
+ // options
+ $kb_wysiwyg = false;
+ if ( $kb_config['wysiwyg'] ) // Html Textblock
+ {
+ 	if ( file_exists( $mx_root_path . 'modules/tinymce/jscripts/tiny_mce/blank.htm' ) )
+ 	{
+ 		$bbcode_on = false;
+ 		$html_on = true;
+ 		$smilies_on = false;
+ 		$kb_wysiwyg = true;		
+ 	}
+ }
+ 
+ if ( !$kb_wysiwyg ) 
+ {
+ 	$bbcode_on = $kb_config['allow_bbcode'] ? true : false;
+ 	$html_on = $kb_config['allow_html'] ? true : false;
+ 	$smilies_on = $kb_config['allow_smilies'] ? true : false;
+ }
+ 
  // Newssuite operation mode?
  //-------------------------------------------------------------------------
***************
*** 250,254 ****
  else if ( $mode == 'add' )
  {
! 	include( $module_root_path . 'includes/kb_add.' . $phpEx );
  }
  else if ( $mode == 'search' )
--- 246,250 ----
  else if ( $mode == 'add' )
  {
! 	include( $module_root_path . 'includes/kb_post.' . $phpEx );
  }
  else if ( $mode == 'search' )
***************
*** 258,262 ****
  else if ( $mode == 'edit' )
  {
! 	include( $module_root_path . 'includes/kb_edit.' . $phpEx );
  }
  else if ( $mode == 'rate' )
--- 254,258 ----
  else if ( $mode == 'edit' )
  {
! 	include( $module_root_path . 'includes/kb_post.' . $phpEx );
  }
  else if ( $mode == 'rate' )

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** db_install.php	6 Mar 2005 01:12:29 -0000	1.21
--- db_install.php	26 Mar 2005 22:52:35 -0000	1.22
***************
*** 145,148 ****
--- 145,154 ----
  		"INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('news_sort', 'Alphabetic')",
  		"INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('news_sort_par', 'ASC')",
+ 		// kb 2.0
+ 		"INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('wysiwyg', '0')",
+ 		"INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_html', '1')",
+ 		"INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_bbcode', '1')",
+ 		"INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_smilies', '1')",
+ 		"INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allowed_html_tags', 'b,i,u,a')",
  
  		"CREATE TABLE " . $mx_table_prefix . "kb_types (

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/db_upgrade.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** db_upgrade.php	18 Mar 2005 21:03:12 -0000	1.14
--- db_upgrade.php	26 Mar 2005 22:52:35 -0000	1.15
***************
*** 116,119 ****
--- 116,132 ----
  		$message .= "<b>Validating v. 1.09...ok</b><br/><br/>";
  	} 
+ 	// validate before 2.00
+ 	$result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "kb_config WHERE config_name = 'wysiwyg'" );
+ 	if ( $db->sql_numrows( $result ) == 0 )
+ 	{
+ 		$upgrade_200 = 1;
+ 		$message .= "<b>Validating v. 2.00...ok</b><br/><br/>";
+ 	}
+ 	else
+ 	{
+ 		$message .= "<b>Validating v. 2.00...ok</b><br/><br/>";
+ 	} 	
+ 	
+ 	
  	// ------------------------------------------------------------------------------------------------------
  	if ( $upgrade_105 == 1 )
***************
*** 229,232 ****
--- 242,254 ----
          				WHERE config_name = 'allow_rating'";						
  	}					
+ 	
+ 	if ( $upgrade_200 == 1 )
+ 	{	
+ 		$sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('wysiwyg', '0')";
+ 		$sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_html', '1')";
+ 		$sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_bbcode', '1')";
+ 		$sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_smilies', '1')";
+ 		$sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allowed_html_tags', 'b,i,u,a')";
+ 	}
  	else
  	{