|
From: MW <jo...@us...> - 2008-02-09 12:50:45
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29268/modules/mx_textblocks/admin Modified Files: mx_module_defs.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mx_module_defs.php 4 Feb 2008 16:55:13 -0000 1.27 --- mx_module_defs.php 9 Feb 2008 12:50:41 -0000 1.28 *************** *** 50,57 **** function submit_module_parameters( $parameter_data, $block_id ) { ! global $HTTP_POST_VARS, $db, $board_config, $mx_cache, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx; global $html_entities_match, $html_entities_replace; ! $parameter_value = $HTTP_POST_VARS[$parameter_data['parameter_name']]; $parameter_opt = ''; --- 50,57 ---- function submit_module_parameters( $parameter_data, $block_id ) { ! global $mx_request_vars, $db, $board_config, $mx_cache, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx; global $html_entities_match, $html_entities_replace; ! $parameter_value = $mx_request_vars->post($parameter_data['parameter_name']); $parameter_opt = ''; *************** *** 65,72 **** break; case 'CustomizedTextBlock': ! $bbcode_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_bbcode']['parameter_value'] == 'TRUE'; ! $html_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_html']['parameter_value'] == 'TRUE'; ! $smilies_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_smilies']['parameter_value'] == 'TRUE'; ! $board_config['allow_html_tags'] = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['html_tags']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['html_tags']['parameter_id']] : $mx_blockcp->block_parameters['html_tags']['parameter_value']; break; --- 65,72 ---- break; case 'CustomizedTextBlock': ! $bbcode_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_bbcode']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_bbcode']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_bbcode']['parameter_value'] == 'TRUE'; ! $html_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_html']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_html']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_html']['parameter_value'] == 'TRUE'; ! $smilies_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_smilies']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_smilies']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_smilies']['parameter_value'] == 'TRUE'; ! $board_config['allow_html_tags'] = $mx_request_vars->is_post($mx_blockcp->block_parameters['html_tags']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['html_tags']['parameter_id'], MX_TYPE_NO_TAGS) : $mx_blockcp->block_parameters['html_tags']['parameter_value']; break; *************** *** 132,139 **** { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix; ! global $HTTP_POST_VARS; ! $parameter_value = isset($HTTP_POST_VARS['preview']) ? $HTTP_POST_VARS[$parameter_data['parameter_name']] : $parameter_data['parameter_value']; ! $bbcode_uid = isset($HTTP_POST_VARS['preview']) ? '' : $parameter_data['parameter_opt']; // --- 132,139 ---- { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix; ! global $mx_request_vars; ! $parameter_value = $mx_request_vars->is_post('preview') ? $mx_request_vars->post($parameter_data['parameter_name'], MX_TYPE_NO_TAGS) : $parameter_data['parameter_value']; ! $bbcode_uid = $mx_request_vars->is_post('preview') ? '' : $parameter_data['parameter_opt']; // *************** *** 151,155 **** $mx_text->init($html_on, $bbcode_on, $smilies_on); ! if ( isset($HTTP_POST_VARS['preview']) ) { // --- 151,155 ---- $mx_text->init($html_on, $bbcode_on, $smilies_on); ! if ($mx_request_vars->is_post('preview')) { // *************** *** 268,282 **** { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace; ! global $HTTP_POST_VARS; ! $parameter_value = isset($HTTP_POST_VARS['preview']) ? $HTTP_POST_VARS[$parameter_data['parameter_name']] : $parameter_data['parameter_value']; ! $bbcode_uid = isset($HTTP_POST_VARS['preview']) ? '' : $parameter_data['parameter_opt']; // // Toggles ????????????????? // ! $bbcode_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_bbcode']['parameter_value'] == 'TRUE'; ! $html_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_html']['parameter_value'] == 'TRUE'; ! $smilies_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_smilies']['parameter_value'] == 'TRUE'; // --- 268,282 ---- { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace; ! global $mx_request_vars; ! $parameter_value = $mx_request_vars->is_post('preview') ? $mx_request_vars->post($parameter_data['parameter_name'], MX_TYPE_NO_TAGS) : $parameter_data['parameter_value']; ! $bbcode_uid = $mx_request_vars->is_post('preview') ? '' : $parameter_data['parameter_opt']; // // Toggles ????????????????? // ! $bbcode_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_bbcode']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_bbcode']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_bbcode']['parameter_value'] == 'TRUE'; ! $html_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_html']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_html']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_html']['parameter_value'] == 'TRUE'; ! $smilies_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_smilies']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_smilies']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_smilies']['parameter_value'] == 'TRUE'; // *************** *** 287,291 **** $mx_text->init($html_on, $bbcode_on, $smilies_on); ! if ( isset($HTTP_POST_VARS['preview']) ) { // --- 287,291 ---- $mx_text->init($html_on, $bbcode_on, $smilies_on); ! if ($mx_request_vars->is_post('preview')) { // *************** *** 402,409 **** { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace; ! global $HTTP_POST_VARS; ! $parameter_value = isset($HTTP_POST_VARS['preview']) ? $HTTP_POST_VARS[$parameter_data['parameter_name']] : $parameter_data['parameter_value']; ! $bbcode_uid = isset($HTTP_POST_VARS['preview']) ? '' : $parameter_data['parameter_opt']; // --- 402,409 ---- { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace; ! global $mx_request_vars; ! $parameter_value = $mx_request_vars->is_post('preview') ? $mx_request_vars->post($parameter_data['parameter_name'], MX_TYPE_NO_TAGS) : $parameter_data['parameter_value']; ! $bbcode_uid = $mx_request_vars->is_post('preview') ? '' : $parameter_data['parameter_opt']; // *************** *** 427,431 **** $mx_text->allow_all_html_tags = true; ! if ( isset($HTTP_POST_VARS['preview']) ) { // --- 427,431 ---- $mx_text->allow_all_html_tags = true; ! if ($mx_request_vars->is_post('preview')) { // |