Menu
▾
▴
[mxbb-commits] core/includes mx_constants.php, 1.21, 1.22 mx_functions_admincp.php, 1.22, 1.23 mx_functions_phpbb.php, 1.24, 1.25 mx_functions_tools.php, 1.3, 1.4
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:27
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/includes Modified Files: mx_constants.php mx_functions_admincp.php mx_functions_phpbb.php mx_functions_tools.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mx_functions_admincp.php 17 Jun 2006 20:09:06 -0000 1.22 --- mx_functions_admincp.php 26 Jun 2006 21:32:22 -0000 1.23 *************** *** 2491,2534 **** // - // 0: option 1: option_id, 2: parameter_id, 3: option_code, - // 4: option_desc - // - /* - case 'option': - $module_data[2] = $parameter_id; - - if( $delete_option ) - { - break; - } - - $safe_row = mx_get_info(PARAMETER_OPTION_TABLE, 'parameter_id', $parameter_id, 'option_code', $module_data['3']); - if( $module_data['4'] == 'endoflist' ) - { - $old_items = $this->get_old_items(PARAMETER_OPTION_TABLE, 'parameter_id', $parameter_id, 'option_id', $exists_option_ids); - - for( $f = 0; $f < count($old_items); $f++ ) - { - $insert_array = implode($delimeter, array('option', $old_items[$f]['option_id'], $old_items[$f]['parameter_id'], $old_items[$f]['option_code'], 'delete')); - $fcontents = $this->mx_array_insert($fcontents, $i, $insert_array); - $delete_option = true; - } - } - else if( $safe_row ) - { - $option_id = $safe_row['option_id']; - $module_data[1] = $option_id; - $exists_option_ids[] = $option_id; - } - else - { - $option_id_max++; - $option_id = $option_id_max; - $module_data[1] = $option_id; - } - break; - */ - - // // 0: block, 1: block_id, 2: block_title, 3: block_desc, // 4: function_id, 5: auth_view, 6: auth_edit, 7: auth_delete --- 2491,2494 ---- *************** *** 2695,2721 **** // - // 0: option, 1: option_id, 2: parameter_id, 3: option_code, - // 4: option_desc - // - /* - case 'option': - $table = PARAMETER_OPTION_TABLE; - $fldkey = 'option_id'; - $key = $module_data[1]; - - $sql_add = "INSERT INTO " . PARAMETER_OPTION_TABLE . " (option_id, parameter_id, option_code, option_desc) - VALUES ('$module_data[1]', '$module_data[2]', '$module_data[3]', '$module_data[4]' )"; - - $sql_update = "UPDATE " . PARAMETER_OPTION_TABLE . " - SET parameter_id = '$module_data[2]', - option_code = '$module_data[3]', - option_desc = '$module_data[4]' - WHERE option_id = '$module_data[1]'"; - - $sql_delete = "DELETE FROM " . PARAMETER_OPTION_TABLE . " WHERE option_id = " . $module_data[1] . " AND parameter_id = " . $module_data[2]; - break; - */ - - // // 0: block, 1: block_id, 2: block_title, 3: block_desc, // 4: function_id, 5: auth_view, 6: auth_edit, 7: auth_delete --- 2655,2658 ---- *************** *** 2792,2799 **** } - /* - // Delete all related blocks - $output_message .= pak_modify_block_par('delete', $module_data[2], $pak_error, $pak_debug); - */ } else if( $module_data[0] == 'parameter' ) --- 2729,2732 ---- *************** *** 2815,2822 **** } - /* - // Delete all related block_pars - $output_message .= pak_modify_block_par('delete', $module_data, $pak_error, $pak_debug); - */ } else --- 2748,2751 ---- *************** *** 2825,2842 **** // delete option // - /* - $output_message .= ' - <font color=#0000ff>delete</font> ' . $module_data[0] . ' (' . $module_data[1] . ', ' . $module_data[2] .', ' . ') ' .'<br />'; - $result = $pak_debug == false ? $db->sql_query($sql_delete) : true; - if( !$result ) - { - $output_message .= '<br /><b><font color=#0000FF>[db...error]</font></b> line: ' . __LINE__ . ' , ' . $sql_delete . '<br />'; - $pak_error = true; - } - else - { - $output_message .= '<font color=#00ff00>[db...ok]</font>' . '<br />'; - } - */ } } --- 2754,2758 ---- *************** *** 2863,2879 **** } - /* - // Now add new parameters to old blocks - if( $module_data[0] == 'parameter' ) - { - $output_message .= pak_modify_block_par('add', $module_data, $pak_error, $pak_debug); - } - - // Now insert new parameters to new blocks - if( $module_data[0] == 'block' ) - { - $output_message .= pak_insert_newblock_pars($module_data, $pak_error, $pak_debug); - } - */ } else --- 2779,2782 ---- *************** *** 2945,2956 **** } - /* - else if( file_exists("../install/db_upgrade.php") && $upgrade_module && $module_filerow == './' && !$pak_debug ) - { - include("../install/db_upgrade.php"); - $message = $lang['Module_Config_updated']; - } - */ - $return_message = array(); $return_message['new_module_id'] = $mx_module_id; --- 2848,2851 ---- *************** *** 3042,3070 **** $paramater_id = $resultset_param[$p]['parameter_id']; - - /* - // Parameter Option - $sql = "SELECT * FROM " . PARAMETER_OPTION_TABLE . " WHERE parameter_id = $paramater_id ORDER BY option_id"; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't read Parameter data", "", __LINE__, __FILE__, $sql); - } - $resultset_opt = $db->sql_fetchrowset($result); - - // 0: option, 1: option_id, 2: parameter_id, 3: option_code, - // 4: option_desc - for( $o = 0; $o < count($resultset_opt); $o++ ) - { - $module_pak .= 'option' . $delimeter . $resultset_opt[$o]['option_id'] . $delimeter; - $module_pak .= $resultset_opt[$o]['parameter_id'] . $delimeter; - $module_pak .= $resultset_opt[$o]['option_code'] . $delimeter; - $module_pak .= $resultset_opt[$o]['option_desc'] . "\n"; - } - - $module_pak .= 'option' . $delimeter. '0' . $delimeter; - $module_pak .= '0' . $delimeter; - $module_pak .= '0' . $delimeter; - $module_pak .= 'endoflist' . $delimeter . "\n"; - */ } --- 2937,2940 ---- *************** *** 3076,3107 **** $module_pak .= '0' . "\n"; - /* - // block - $sql = "SELECT * FROM " . BLOCK_TABLE . " WHERE function_id = $function_id"; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't read block data", "", __LINE__, __FILE__, $sql); - } - $resultset_param = $db->sql_fetchrowset($result); - - // 0: block, 1: block_id, 2: block_title, 3: block_desc, - // 4: function_id, 5: auth_view, 6: auth_edit, 7: auth_delete - for( $p = 0; $p < count($resultset_param); $p++ ) - { - $module_pak .= 'block' . $delimeter . $resultset_param[$p]['block_id'] . $delimeter; - $module_pak .= $resultset_param[$p]['block_title'] . $delimeter; - $module_pak .= $resultset_param[$p]['block_desc'] . $delimeter; - $module_pak .= $resultset_param[$p]['function_id'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_view'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_edit'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_delete'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_view_group'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_edit_group'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_delete_group'] . $delimeter; - $module_pak .= $resultset_param[$p]['show_title'] . $delimeter; - $module_pak .= $resultset_param[$p]['show_block'] . "\n"; - } - */ - // Only output 1 default block --- 2946,2949 ---- *************** *** 3148,3152 **** function mx_add_search_words($mode, $block_id, $post_text, $post_title = '') { ! global $db, $phpbb_root_path, $board_config, $lang; $search_match_table = MX_MATCH_TABLE; --- 2990,2996 ---- function mx_add_search_words($mode, $block_id, $post_text, $post_title = '') { ! global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! ! include($phpbb_root_path . 'includes/functions_search.' . $phpEx); $search_match_table = MX_MATCH_TABLE; Index: mx_constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_constants.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_constants.php 17 Jun 2006 20:09:06 -0000 1.21 --- mx_constants.php 26 Jun 2006 21:32:22 -0000 1.22 *************** *** 61,63 **** --- 61,72 ---- define('MX_SEARCH_TABLE' , $mx_table_prefix . 'search_results'); /**#@-*/ + + /** + * Sick and tired of these variables getting lost... + */ + $html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#', '#"#'); + $html_entities_replace = array('&', '<', '>', '"'); + + $unhtml_specialchars_match = array('#>#', '#<#', '#"#', '#&#'); + $unhtml_specialchars_replace = array('>', '<', '"', '&'); ?> \ No newline at end of file Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mx_functions_phpbb.php 17 Jun 2006 20:09:07 -0000 1.24 --- mx_functions_phpbb.php 26 Jun 2006 21:32:22 -0000 1.25 *************** *** 43,47 **** function mx_generate_smilies($mode, $page_id) { ! global $board_config, $template, $phpEx; $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; --- 43,49 ---- function mx_generate_smilies($mode, $page_id) { ! global $board_config, $template, $phpbb_root_path, $phpEx; ! include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); ! $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; *************** *** 65,68 **** --- 67,74 ---- function mx_decode($bbtext, $bbcode_uid, $smilies_on = true) { + global $phpbb_root_path, $phpEx; + + include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); + $mytext = stripslashes($bbtext); if (!empty($bbcode_uid)) *************** *** 75,80 **** } $mytext = str_replace("\n", "\n<br />\n", $mytext); - //$mytext = make_clickable($mytext); - //return $mytext; return make_clickable($mytext); } --- 81,84 ---- Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_functions_tools.php 25 Jun 2006 21:52:41 -0000 1.3 --- mx_functions_tools.php 26 Jun 2006 21:32:22 -0000 1.4 *************** *** 146,150 **** if ( $text != '' ) { ! $text = smilies_pass($text); } } --- 146,150 ---- if ( $text != '' ) { ! $text = mx_smilies_pass($text); } } *************** *** 368,372 **** if( $this->smilies_on ) { ! $text = smilies_pass($text); } --- 368,372 ---- if( $this->smilies_on ) { ! $text = mx_smilies_pass($text); } |
