Menu
▾
▴
[mxbb-commits] mx_kb/kb/modules kb_article.php, 1.9, 1.10 kb_cat.php, 1.5, 1.6 kb_moderator.php, 1.4, 1.5 kb_post.php, 1.7, 1.8 kb_post_comment.php, 1.7, 1.8 kb_rate.php, 1.6, 1.7 kb_search.php, 1.5, 1.6 kb_stats.php, 1.4, 1.5
Update of /cvsroot/mxbb/mx_kb/kb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6489/modules/mx_kb/kb/modules Modified Files: kb_article.php kb_cat.php kb_moderator.php kb_post.php kb_post_comment.php kb_rate.php kb_search.php kb_stats.php Log Message: massive fix Index: kb_stats.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_stats.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_stats.php 4 Jul 2006 22:33:32 -0000 1.4 --- kb_stats.php 5 Jul 2006 22:48:26 -0000 1.5 *************** *** 66,70 **** 'L_ARTICLES' => $lang['Articles'], 'PATH' => '» ' . $path_kb, ! 'U_CAT' => append_sid( this_kb_mxurl( 'mode=cat&cat=' . $category_id ) ) )); --- 66,70 ---- 'L_ARTICLES' => $lang['Articles'], 'PATH' => '» ' . $path_kb, ! 'U_CAT' => append_sid( $this->this_mxurl( 'mode=cat&cat=' . $category_id ) ) )); *************** *** 77,81 **** if ( $total_articles > 0 ) { ! // $pagination = generate_pagination( this_kb_mxurl( "mode=cat&cat=$category_id" ), $total_articles, $kb_config['pagination'], $start ) . ' '; } --- 77,81 ---- if ( $total_articles > 0 ) { ! // $pagination = generate_pagination( $this->this_mxurl( "mode=cat&cat=$category_id" ), $total_articles, $kb_config['pagination'], $start ) . ' '; } Index: kb_post.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** kb_post.php 29 Jun 2006 13:14:20 -0000 1.7 --- kb_post.php 5 Jul 2006 22:48:26 -0000 1.8 *************** *** 125,129 **** // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 125,129 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 131,134 **** --- 131,136 ---- $mx_text->init($html_on, $bbcode_on, $smilies_on); + $mx_text_formatting = new mx_text_formatting(); + // // Allow all html tags *************** *** 144,148 **** if ( !$mx_request_vars->is_request('article_name') || !$mx_request_vars->is_request('article_desc') || !$mx_request_vars->is_request('message') ) { ! $message = $lang['Empty_fields'] . '<br /><br />' . sprintf( $lang['Empty_fields_return'], '<a href="' . append_sid( this_kb_mxurl( 'mode=add' ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 146,150 ---- if ( !$mx_request_vars->is_request('article_name') || !$mx_request_vars->is_request('article_desc') || !$mx_request_vars->is_request('message') ) { ! $message = $lang['Empty_fields'] . '<br /><br />' . sprintf( $lang['Empty_fields_return'], '<a href="' . append_sid( $this->this_mxurl( 'mode=add' ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 166,170 **** if ( !($this->auth_user[$category_id]['auth_edit'] || $this->auth_user[$category_id]['auth_mod']) ) { ! $message = $lang['No_edit'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 168,172 ---- if ( !($this->auth_user[$category_id]['auth_edit'] || $this->auth_user[$category_id]['auth_mod']) ) { ! $message = $lang['No_edit'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 199,203 **** if ( !($this->auth_user[$category_id]['auth_post'] || $this->auth_user[$category_id]['auth_mod']) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 201,205 ---- if ( !($this->auth_user[$category_id]['auth_post'] || $this->auth_user[$category_id]['auth_mod']) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 264,272 **** if ( $approve == 1 ) { ! $message = $lang['Article_submitted'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf($lang['Click_return_article'], '<a href="' . append_sid(this_kb_mxurl("mode=article&k=" . $article_id)). '">', '</a>') . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } else { ! $message = $lang['Article_submitted_Approve'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } mx_message_die( GENERAL_MESSAGE, $message ); --- 266,274 ---- if ( $approve == 1 ) { ! $message = $lang['Article_submitted'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf($lang['Click_return_article'], '<a href="' . append_sid($this->this_mxurl("mode=article&k=" . $article_id)). '">', '</a>') . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } else { ! $message = $lang['Article_submitted_Approve'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } mx_message_die( GENERAL_MESSAGE, $message ); *************** *** 278,286 **** // - // Instatiate text tools - // - $mx_kb_text_tools = new mx_kb_text_tools(); - - // // PreText HIDE/SHOW // --- 280,283 ---- *************** *** 307,311 **** if ( $kb_post_mode == 'edit' && !$this->auth_user[$category_id]['auth_edit'] ) { ! $message = $lang['No_edit'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 304,308 ---- if ( $kb_post_mode == 'edit' && !$this->auth_user[$category_id]['auth_edit'] ) { ! $message = $lang['No_edit'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 313,317 **** if ( $kb_post_mode == 'add' && ( !$this->auth_user[$category_id]['auth_post'] || $kb_config['enable_module'] == 0 ) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 310,314 ---- if ( $kb_post_mode == 'add' && ( !$this->auth_user[$category_id]['auth_post'] || $kb_config['enable_module'] == 0 ) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 329,333 **** if (!$kb_config['allow_images'] || !$kb_config['allow_links']) { ! $preview_text = $mx_kb_text_tools->remove_images_links( $preview_text, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } --- 326,330 ---- if (!$kb_config['allow_images'] || !$kb_config['allow_links']) { ! $preview_text = $mx_text_formatting->remove_images_links( $preview_text, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } *************** *** 393,397 **** } ! $kb_action_url = $kb_post_mode == 'add' ? this_kb_mxurl( 'mode=add' ) : this_kb_mxurl( 'mode=edit' ); $custom_data = $kb_post_mode == 'add' ? $mx_kb_custom_field->display_edit() : $mx_kb_custom_field->display_edit( $article_id ); --- 390,394 ---- } ! $kb_action_url = $kb_post_mode == 'add' ? $this->this_mxurl( 'mode=add' ) : $this->this_mxurl( 'mode=edit' ); $custom_data = $kb_post_mode == 'add' ? $mx_kb_custom_field->display_edit() : $mx_kb_custom_field->display_edit( $article_id ); *************** *** 495,499 **** ) ); ! $this->get_kb_type_list( $type_id ); if ( $kb_post_mode == 'edit' ) --- 492,496 ---- ) ); ! $mx_kb_functions->get_kb_type_list( $type_id ); if ( $kb_post_mode == 'edit' ) Index: kb_moderator.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_moderator.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_moderator.php 17 Jun 2006 20:11:24 -0000 1.4 --- kb_moderator.php 5 Jul 2006 22:48:26 -0000 1.5 *************** *** 59,63 **** if ( !( ($this->auth_user[$category_id]['auth_delete'] || $this->auth_user[$category_id]['auth_mod']) && $userdata['session_logged_in'] ) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 59,63 ---- if ( !( ($this->auth_user[$category_id]['auth_delete'] || $this->auth_user[$category_id]['auth_mod']) && $userdata['session_logged_in'] ) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 118,122 **** $this->update_add_article_notify($article_id, 'approve'); ! $message = $lang['Article_approved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start" ) ) . '">', '</a>' ) ; break; --- 118,122 ---- $this->update_add_article_notify($article_id, 'approve'); ! $message = $lang['Article_approved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( $this->this_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start" ) ) . '">', '</a>' ) ; break; *************** *** 140,144 **** $this->update_add_article_notify($article_id, 'unapprove'); ! $message = $lang['Article_unapproved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; break; --- 140,144 ---- $this->update_add_article_notify($article_id, 'unapprove'); ! $message = $lang['Article_unapproved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( $this->this_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; break; *************** *** 200,204 **** $this->_kb(); ! $message = $lang['Article_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; } --- 200,204 ---- $this->_kb(); ! $message = $lang['Article_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( $this->this_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; } *************** *** 207,211 **** $category_id = ( $ref_stats ? 1 : $category_id ); ! $message = $lang['Confirm_art_delete'] . '<br /><br />' . sprintf( $lang['Confirm_art_delete_yes'], '<a href="' . append_sid( this_kb_mxurl( "mode=moderate&action=delete&page=$page_id&cat=$category_id&c=yes&a=$article_id&start=$start" ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Confirm_art_delete_no'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx?page=$page_id&mode=cat&cat=$category_id&start=$start" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 207,211 ---- $category_id = ( $ref_stats ? 1 : $category_id ); ! $message = $lang['Confirm_art_delete'] . '<br /><br />' . sprintf( $lang['Confirm_art_delete_yes'], '<a href="' . append_sid( $this->this_mxurl( "mode=moderate&action=delete&page=$page_id&cat=$category_id&c=yes&a=$article_id&start=$start" ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Confirm_art_delete_no'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx?page=$page_id&mode=cat&cat=$category_id&start=$start" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } Index: kb_article.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_article.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** kb_article.php 4 Jul 2006 22:33:32 -0000 1.9 --- kb_article.php 5 Jul 2006 22:48:26 -0000 1.10 *************** *** 29,33 **** global $template, $lang, $db, $phpEx, $kb_config, $mx_request_vars, $userdata; global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx, $images; ! global $mx_kb_custom_field, $print_version, $board_config, $mx_block; // --- 29,33 ---- global $template, $lang, $db, $phpEx, $kb_config, $mx_request_vars, $userdata; global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx, $images; ! global $mx_kb_custom_field, $mx_kb_functions, $print_version, $board_config, $mx_block; // *************** *** 52,58 **** { case 'oracle': ! $sql = "SELECT f.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username ! FROM " . KB_ARTICLES_TABLE . " AS f, " . KB_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u WHERE f.article_id = r.votes_article(+) AND f.article_author_id = u.user_id(+) AND f.article_id = $article_id --- 52,59 ---- { case 'oracle': ! $sql = "SELECT f.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, typ.type ! FROM " . KB_ARTICLES_TABLE . " AS f, " . KB_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . KB_TYPES_TABLE . " AS typ WHERE f.article_id = r.votes_article(+) + AND f.article_type = typ.id(+) AND f.article_author_id = u.user_id(+) AND f.article_id = $article_id *************** *** 62,68 **** default: ! $sql = "SELECT f.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username FROM " . KB_ARTICLES_TABLE . " AS f LEFT JOIN " . KB_VOTES_TABLE . " AS r ON f.article_id = r.votes_article LEFT JOIN " . USERS_TABLE . " AS u ON f.article_author_id = u.user_id WHERE f.article_id = $article_id --- 63,70 ---- default: ! $sql = "SELECT f.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, typ.type FROM " . KB_ARTICLES_TABLE . " AS f LEFT JOIN " . KB_VOTES_TABLE . " AS r ON f.article_id = r.votes_article + LEFT JOIN " . KB_TYPES_TABLE . " AS typ ON f.article_type = typ.id LEFT JOIN " . USERS_TABLE . " AS u ON f.article_author_id = u.user_id WHERE f.article_id = $article_id *************** *** 87,91 **** if ( ( !$this->auth_user[$kb_row['article_category_id']]['auth_view'] ) ) { ! $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 89,93 ---- if ( ( !$this->auth_user[$kb_row['article_category_id']]['auth_view'] ) ) { ! $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 101,107 **** $approved = $kb_row['approved']; $date = create_date( $board_config['default_dateformat'], $kb_row['article_date'], $board_config['board_timezone'] ); ! ! $type_id = $kb_row['article_type']; ! $type = $this->get_kb_type( $type_id ); $new_views = $kb_row['views'] + 1; --- 103,107 ---- $approved = $kb_row['approved']; $date = create_date( $board_config['default_dateformat'], $kb_row['article_date'], $board_config['board_timezone'] ); ! $type = $kb_row['type']; $new_views = $kb_row['views'] + 1; *************** *** 123,127 **** // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 123,127 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 130,133 **** --- 130,135 ---- $mx_text->allow_all_html_tags = $kb_config['allow_wysiwyg'] ? true : false; + $mx_text_formatting = new mx_text_formatting(); + // // Decode article for display *************** *** 137,146 **** $article = $mx_text->display($article, $bbcode_uid); ! $article = $this->article_formatting( $article ); ! ! // ! // Instatiate text tools ! // ! $mx_kb_text_tools = new mx_kb_text_tools(); // --- 139,143 ---- $article = $mx_text->display($article, $bbcode_uid); ! $article = $mx_kb_functions->article_formatting( $article ); // *************** *** 149,153 **** if (!$kb_config['allow_images'] || !$kb_config['allow_inks']) { ! $article = $mx_kb_text_tools->remove_images_links( $article, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } --- 146,150 ---- if (!$kb_config['allow_images'] || !$kb_config['allow_inks']) { ! $article = $mx_text_formatting->remove_images_links( $article, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } *************** *** 157,176 **** if ( $kb_config['max_subject_chars'] > 0 ) { ! $article_title = $mx_kb_text_tools->truncate_text( $article_title, $kb_config['max_subject_chars'], true ); } if ( $kb_config['max_description_chars'] > 0 ) { ! $article_description = $mx_kb_text_tools->truncate_text( $article_description, $kb_config['max_description_chars'], true ); } if ( $kb_config['max_chars'] > 0 ) { ! $article = $mx_kb_text_tools->truncate_text( $article, $kb_config['max_chars'], true ); } if ( $kb_config['formatting_truncate_links'] || $kb_config['formatting_image_resize'] > 0 || $kb_config['formatting_wordwrap'] ) { ! $article = $mx_kb_text_tools->decode( $article, $kb_config['formatting_truncate_links'], intval($kb_config['formatting_image_resize']), $kb_config['formatting_wordwrap'] ); } --- 154,173 ---- if ( $kb_config['max_subject_chars'] > 0 ) { ! $article_title = $mx_text_formatting->truncate_text( $article_title, $kb_config['max_subject_chars'], true ); } if ( $kb_config['max_description_chars'] > 0 ) { ! $article_description = $mx_text_formatting->truncate_text( $article_description, $kb_config['max_description_chars'], true ); } if ( $kb_config['max_chars'] > 0 ) { ! $article = $mx_text_formatting->truncate_text( $article, $kb_config['max_chars'], true ); } if ( $kb_config['formatting_truncate_links'] || $kb_config['formatting_image_resize'] > 0 || $kb_config['formatting_wordwrap'] ) { ! $article = $mx_text_formatting->decode( $article, $kb_config['formatting_truncate_links'], intval($kb_config['formatting_image_resize']), $kb_config['formatting_wordwrap'] ); } *************** *** 178,182 **** // Format text and data // ! $temp_url = append_sid( this_kb_mxurl( "mode=cat&cat=$article_category_id" ) ); $category = '<a href="' . $temp_url . '" class="gensmall">' . $article_category_name . '</a>'; --- 175,179 ---- // Format text and data // ! $temp_url = append_sid( $this->this_mxurl( "mode=cat&cat=$article_category_id" ) ); $category = '<a href="' . $temp_url . '" class="gensmall">' . $article_category_name . '</a>'; *************** *** 187,191 **** else { ! $author_name = $this->get_kb_author( $author_id ); $temp_url = append_sid( $phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$author_id" ); $author_kb_art = '<a href="' . $temp_url . '" class="gensmall">' . $author_name . '</a>'; --- 184,188 ---- else { ! $author_name = $kb_row['username']; $temp_url = append_sid( $phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$author_id" ); $author_kb_art = '<a href="' . $temp_url . '" class="gensmall">' . $author_name . '</a>'; *************** *** 210,214 **** if ( ( $userdata['user_id'] == $author_id && $this->auth_user[$article_category_id]['auth_edit'] ) || $this->auth_user[$article_category_id]['auth_mod'] ) { ! $temp_url = append_sid( this_kb_mxurl( "mode=edit&k=" . $article_id ) ); $edit_img = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_edit'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>'; $edit = '<a href="' . $temp_url . '">' . $lang['Edit_delete_post'] . '</a>'; --- 207,211 ---- if ( ( $userdata['user_id'] == $author_id && $this->auth_user[$article_category_id]['auth_edit'] ) || $this->auth_user[$article_category_id]['auth_mod'] ) { ! $temp_url = append_sid( $this->this_mxurl( "mode=edit&k=" . $article_id ) ); $edit_img = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_edit'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>'; $edit = '<a href="' . $temp_url . '">' . $lang['Edit_delete_post'] . '</a>'; *************** *** 225,229 **** if ( !$this->auth_user[$article_category_id]['auth_view'] || !$article_title || ( !$approved && !$this->auth_user[$article_category_id]['auth_mod'] ) || ( !$this->ns_auth_cat( $article_category_id ) && !$print_version ) ) { ! $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 222,226 ---- if ( !$this->auth_user[$article_category_id]['auth_view'] || !$article_title || ( !$approved && !$this->auth_user[$article_category_id]['auth_mod'] ) || ( !$this->ns_auth_cat( $article_category_id ) && !$print_version ) ) { ! $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 249,253 **** } ! $print_url = append_sid( this_kb_mxurl( "mode=article&k=" . $article_id ."&page_num=".($page_num+1)."&start=".$start ."&print=true", true ) ); $template->assign_vars( array( --- 246,250 ---- } ! $print_url = append_sid( $this->this_mxurl( "mode=article&k=" . $article_id ."&page_num=".($page_num+1)."&start=".$start ."&print=true", true ) ); $template->assign_vars( array( *************** *** 339,347 **** if ( !$print_version ) { ! $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id&page_num=$page_number" . $start_pag . $original_highlight) ); } else { ! $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id&page_num=$page_number&print=true" . $start_pag . $original_highlight, true ) ); } $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; --- 336,344 ---- if ( !$print_version ) { ! $temp_url = append_sid( $this->this_mxurl( "mode=article&k=$article_id&page_num=$page_number" . $start_pag . $original_highlight) ); } else { ! $temp_url = append_sid( $this->this_mxurl( "mode=article&k=$article_id&page_num=$page_number&print=true" . $start_pag . $original_highlight, true ) ); } $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; *************** *** 394,398 **** // 'RATE_IMG' => $rate_img, ! 'U_RATE' => append_sid( this_kb_mxurl( 'mode=rate&k=' . $article_id ) ), )); } --- 391,395 ---- // 'RATE_IMG' => $rate_img, ! 'U_RATE' => append_sid( $this->this_mxurl( 'mode=rate&k=' . $article_id ) ), )); } Index: kb_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_search.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kb_search.php 4 Jul 2006 22:33:32 -0000 1.5 --- kb_search.php 5 Jul 2006 22:48:26 -0000 1.6 *************** *** 36,40 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".this_kb_mxurl("action=stats"), true)); } --- 36,40 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=stats"), true)); } *************** *** 531,536 **** for( $i = 0; $i < count( $searchset ); $i++ ) { ! $cat_url = append_sid( this_kb_mxurl( 'mode=cat&cat=' . $searchset[$i]['category_id'] ) ); ! $file_url = append_sid( this_kb_mxurl( 'mode=article&k=' . $searchset[$i]['article_id'] ) ); // =================================================== // Format the date for the given article --- 531,536 ---- for( $i = 0; $i < count( $searchset ); $i++ ) { ! $cat_url = append_sid( $this->this_mxurl( 'mode=cat&cat=' . $searchset[$i]['category_id'] ) ); ! $file_url = append_sid( $this->this_mxurl( 'mode=article&k=' . $searchset[$i]['article_id'] ) ); // =================================================== // Format the date for the given article *************** *** 563,567 **** ); } ! $base_url = append_sid( this_kb_mxurl( "mode=search&search_id=$search_id" ) ); $template->assign_vars( array( --- 563,567 ---- ); } ! $base_url = append_sid( $this->this_mxurl( "mode=search&search_id=$search_id" ) ); $template->assign_vars( array( *************** *** 571,575 **** 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( this_kb_mxurl() ), 'L_INDEX' => "<<", --- 571,575 ---- 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'L_INDEX' => "<<", *************** *** 597,601 **** $template->assign_vars( array( ! 'S_SEARCH_ACTION' => append_sid( this_kb_mxurl() ), 'S_CAT_MENU' => $dropmenu, --- 597,601 ---- $template->assign_vars( array( ! 'S_SEARCH_ACTION' => append_sid( $this->this_mxurl() ), 'S_CAT_MENU' => $dropmenu, *************** *** 603,607 **** 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( this_kb_mxurl() ), 'L_YES' => $lang['Yes'], --- 603,607 ---- 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'L_YES' => $lang['Yes'], Index: kb_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_rate.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kb_rate.php 4 Jul 2006 22:33:32 -0000 1.6 --- kb_rate.php 5 Jul 2006 22:48:26 -0000 1.7 *************** *** 73,78 **** 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( this_kb_mxurl() ), ! 'U_FILE_NAME' => append_sid( this_kb_mxurl( 'mode=article&k=' . $article_id ) ), 'FILE_NAME' => $article_data['file_name'], --- 73,78 ---- 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => append_sid( $this->this_mxurl( 'mode=article&k=' . $article_id ) ), 'FILE_NAME' => $article_data['file_name'], *************** *** 91,95 **** } ! $mx_kb_user->update_voter_info( $article_id, $rating, $article_data['article_category_id'] ); $rate_info = $mx_kb_functions->get_rating( $article_id ); --- 91,95 ---- } ! $this->update_voter_info( $article_id, $rating, $article_data['article_category_id'] ); $rate_info = $mx_kb_functions->get_rating( $article_id ); *************** *** 97,101 **** $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . append_sid( this_kb_mxurl( "action=link&link_id=$article_id" ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 97,101 ---- $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . append_sid( $this->this_mxurl( "action=link&link_id=$article_id" ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 105,109 **** $template->assign_vars( array( ! 'S_RATE_ACTION' => append_sid( this_kb_mxurl( 'mode=rate&k=' . $article_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], --- 105,109 ---- $template->assign_vars( array( ! 'S_RATE_ACTION' => append_sid( $this->this_mxurl( 'mode=rate&k=' . $article_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], Index: kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_cat.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kb_cat.php 4 Jul 2006 22:33:32 -0000 1.5 --- kb_cat.php 5 Jul 2006 22:48:26 -0000 1.6 *************** *** 62,66 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". pa_this_mxurl("action=category&cat_id=" . $cat_id, true), true)); } --- 62,66 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $this->this_mxurl("mode=cat&cat=" . $cat_id, true), true)); } *************** *** 71,75 **** if ( !isset( $this->cat_rowset[$category_id] ) ) { ! $message = $lang['Category_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 71,75 ---- if ( !isset( $this->cat_rowset[$category_id] ) ) { ! $message = $lang['Category_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 111,115 **** { $total_articles = $total['total']; ! $pagination = generate_pagination( this_kb_mxurl( "mode=cat&cat=$category_id" ), $total_articles, $kb_config['pagination'], $start ) . ' '; } --- 111,115 ---- { $total_articles = $total['total']; ! $pagination = generate_pagination( $this->this_mxurl( "mode=cat&cat=$category_id" ), $total_articles, $kb_config['pagination'], $start ) . ' '; } *************** *** 135,139 **** 'L_ARTICLES' => $lang['Articles'], ! 'U_CAT' => append_sid( this_kb_mxurl( 'mode=cat&cat=' . $category_id ) ) ) ); --- 135,139 ---- 'L_ARTICLES' => $lang['Articles'], ! 'U_CAT' => append_sid( $this->this_mxurl( 'mode=cat&cat=' . $category_id ) ) ) ); Index: kb_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post_comment.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** kb_post_comment.php 29 Jun 2006 13:14:20 -0000 1.7 --- kb_post_comment.php 5 Jul 2006 22:48:26 -0000 1.8 *************** *** 70,74 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".this_kb_mxurl("action=post_comment&item_id=" . $item_id), true)); } --- 70,74 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=post_comment&item_id=" . $item_id), true)); } *************** *** 133,137 **** // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 133,137 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 139,142 **** --- 139,143 ---- $mx_text->init($html_on, $bbcode_on, $smilies_on); + $mx_text_formatting = new mx_text_formatting(); // // Allow all html tags *************** *** 181,185 **** $this->_kb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . append_sid( this_kb_mxurl( "mode=article&k=$item_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 182,186 ---- $this->_kb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . append_sid( $this->this_mxurl( "mode=article&k=$item_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 198,202 **** $this->update_add_comment($article_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on); ! $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . append_sid( this_kb_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 199,203 ---- $this->update_add_comment($article_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on); ! $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . append_sid( $this->this_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 205,212 **** // Main // ======================================================= - // - // Instatiate text tools - // - $mx_kb_text_tools = new mx_kb_text_tools(); // --- 206,209 ---- *************** *** 231,235 **** if (!$kb_config['allow_images'] || !$kb_config['allow_links']) { ! $preview_text = $mx_kb_text_tools->remove_images_links( $preview_text, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } --- 228,232 ---- if (!$kb_config['allow_images'] || !$kb_config['allow_links']) { ! $preview_text = $mx_text_formatting->remove_images_links( $preview_text, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } *************** *** 358,364 **** 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( this_kb_mxurl() ), ! 'U_FILE_NAME' => append_sid( this_kb_mxurl( 'mode=article&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => append_sid( this_kb_mxurl() ), 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ); --- 355,361 ---- 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => append_sid( $this->this_mxurl( 'mode=article&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => append_sid( $this->this_mxurl() ), 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ); |
