Menu
▾
▴
[mxbb-commits] mx_kb/kb/modules kb_article.php, 1.15, 1.16 kb_cat.php, 1.8, 1.9 kb_lists.php, 1.4, 1.5 kb_mcp.php, 1.2, 1.3 kb_mini.php, 1.6, 1.7 kb_post.php, 1.12, 1.13 kb_post_comment.php, 1.10, 1.11 kb_rate.php, 1.8, 1.9 kb_search.php, 1.9, 1.10 kb_stats.php, 1.7, 1.8
|
From: Jon O. <jon...@us...> - 2007-09-09 20:06:37
|
Update of /cvsroot/mxbb/mx_kb/kb/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18006/kb/modules Modified Files: kb_article.php kb_cat.php kb_lists.php kb_mcp.php kb_mini.php kb_post.php kb_post_comment.php kb_rate.php kb_search.php kb_stats.php Log Message: for 2.9.x Index: kb_stats.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_stats.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** kb_stats.php 4 Aug 2006 20:10:43 -0000 1.7 --- kb_stats.php 9 Sep 2007 20:06:02 -0000 1.8 *************** *** 103,107 **** 'L_ARTICLES' => $lang['Articles'], 'PATH' => $path_kb, ! 'U_CAT' => append_sid( $this->this_mxurl( 'mode=cat&cat=' . $category_id ) ) )); --- 103,107 ---- 'L_ARTICLES' => $lang['Articles'], 'PATH' => $path_kb, ! 'U_CAT' => mx_append_sid( $this->this_mxurl( 'mode=cat&cat=' . $category_id ) ) )); Index: kb_mcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_mcp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kb_mcp.php 13 Aug 2006 19:43:07 -0000 1.2 --- kb_mcp.php 9 Sep 2007 20:06:02 -0000 1.3 *************** *** 273,282 **** $template->assign_vars( array( 'ARTICLES' => $kb_config['module_name'], ! 'U_ARTICLES' => append_sid( $this->this_mxurl() ), 'L_MCP_TITLE' => $l_title, 'L_MCP_EXPLAIN' => $l_explain, 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_ACTION' => append_sid( $this->this_mxurl( "mode=mcp" ) ) )); --- 273,282 ---- $template->assign_vars( array( 'ARTICLES' => $kb_config['module_name'], ! 'U_ARTICLES' => mx_append_sid( $this->this_mxurl() ), 'L_MCP_TITLE' => $l_title, 'L_MCP_EXPLAIN' => $l_explain, 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_ACTION' => mx_append_sid( $this->this_mxurl( "mode=mcp" ) ) )); *************** *** 435,439 **** 'L_NO_ITEMS' => $lang['No_item'], ! 'PAGINATION' => generate_pagination( append_sid( $this->this_mxurl( "mode=mcp&mode_mcp=$mode&sort_method=$sort_method&sort_order=$sort_order" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), $total_num, $kb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $kb_config['pagination'] ) + 1 ), ceil( $total_num / $kb_config['pagination'] ) ), --- 435,439 ---- 'L_NO_ITEMS' => $lang['No_item'], ! 'PAGINATION' => phpBB2::generate_pagination( mx_append_sid( $this->this_mxurl( "mode=mcp&mode_mcp=$mode&sort_method=$sort_method&sort_order=$sort_order" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), $total_num, $kb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $kb_config['pagination'] ) + 1 ), ceil( $total_num / $kb_config['pagination'] ) ), *************** *** 477,483 **** 'NUMBER' => $i++, 'ID' => $item_data['article_id'], ! 'U_EDIT' => append_sid( $this->this_mxurl( "mode=edit&k={$item_data['article_id']}" ) ), ! 'U_DELETE' => append_sid( $this->this_mxurl( "mode=mcp&mode_mcp=$mode&do_mode=do_delete&id={$item_data['article_id']}" ) ), ! 'U_APPROVE' => append_sid( $this->this_mxurl( "mode=mcp&mode_mcp=$mode&do_mode=$approve_mode&id={$item_data['article_id']}" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), 'L_APPROVE' => ( $item_data['approved'] ) ? $lang['Unapprove'] : $lang['Approve'] ) ); --- 477,483 ---- 'NUMBER' => $i++, 'ID' => $item_data['article_id'], ! 'U_EDIT' => mx_append_sid( $this->this_mxurl( "mode=edit&k={$item_data['article_id']}" ) ), ! 'U_DELETE' => mx_append_sid( $this->this_mxurl( "mode=mcp&mode_mcp=$mode&do_mode=do_delete&id={$item_data['article_id']}" ) ), ! 'U_APPROVE' => mx_append_sid( $this->this_mxurl( "mode=mcp&mode_mcp=$mode&do_mode=$approve_mode&id={$item_data['article_id']}" ) . ($mode == 'cat' ? "&cat_id=$cat_id" : '') ), 'L_APPROVE' => ( $item_data['approved'] ) ? $lang['Unapprove'] : $lang['Approve'] ) ); Index: kb_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_lists.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_lists.php 30 May 2007 21:32:24 -0000 1.4 --- kb_lists.php 9 Sep 2007 20:06:02 -0000 1.5 *************** *** 132,139 **** $template->assign_vars( array( ! 'U_KB' => append_sid( $this->this_mxurl() ), 'L_KB' => $kb_config['module_name'], ! 'BLOCK_PAGINATION' => mx_generate_pagination(append_sid( $this->this_mxurl( '', false, false ) ), $total_num_items, $toplist_config['toplist_pagination'], $start, true, true, true, false, 'kb_start'), )); --- 132,139 ---- $template->assign_vars( array( ! 'U_KB' => mx_append_sid( $this->this_mxurl() ), 'L_KB' => $kb_config['module_name'], ! 'BLOCK_PAGINATION' => mx_generate_pagination(mx_append_sid( $this->this_mxurl( '', false, false ) ), $total_num_items, $toplist_config['toplist_pagination'], $start, true, true, true, false, 'kb_start'), )); Index: kb_post.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** kb_post.php 5 Aug 2007 22:08:47 -0000 1.12 --- kb_post.php 9 Sep 2007 20:06:02 -0000 1.13 *************** *** 141,145 **** $this->delete_items( $article_id ); $this->_kb(); ! $message = $lang['Article_Deleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "mode=cat&cat=" . $cat_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 141,145 ---- $this->delete_items( $article_id ); $this->_kb(); ! $message = $lang['Article_Deleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( "mode=cat&cat=" . $cat_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 226,230 **** 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 ); } --- 226,230 ---- 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="' . mx_append_sid( $this->this_mxurl( 'mode=add' ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 346,354 **** 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>' ); } --- 346,354 ---- if ( $approve == 1 ) { ! $message = $lang['Article_submitted'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . mx_append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf($lang['Click_return_article'], '<a href="' . mx_append_sid($this->this_mxurl("mode=article&k=" . $article_id)). '">', '</a>') . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . mx_append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } else { ! $message = $lang['Article_submitted_Approve'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . mx_append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . mx_append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } *************** *** 502,506 **** 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, 'LINKS_STATUS' => $links_status, --- 502,506 ---- 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . mx_append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, 'LINKS_STATUS' => $links_status, Index: kb_mini.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_mini.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kb_mini.php 2 Jun 2007 19:45:59 -0000 1.6 --- kb_mini.php 9 Sep 2007 20:06:02 -0000 1.7 *************** *** 69,73 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $this->this_mxurl("action=category&cat_id=" . $cat_id, true), true)); } --- 69,73 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=". $this->this_mxurl("action=category&cat_id=" . $cat_id, true), true)); } *************** *** 106,110 **** $template->assign_vars( array( ! 'U_KB' => append_sid( $this->this_mxurl() ), 'L_KB' => $kb_config['module_name'], --- 106,110 ---- $template->assign_vars( array( ! 'U_KB' => mx_append_sid( $this->this_mxurl() ), 'L_KB' => $kb_config['module_name'], *************** *** 113,118 **** 'MX_PAGE' => $page_id, ! 'S_JUMPBOX_ACTION' => append_sid( $this->this_mxurl( ) ), ! 'BLOCK_PAGINATION' => mx_generate_pagination(append_sid( $this->this_mxurl( 'cat=' . $cat_id, false, false ) ), $total_num_items, $mini_config['mini_pagination'], $start, true, true, true, false, 'mini_start'), )); } --- 113,118 ---- 'MX_PAGE' => $page_id, ! 'S_JUMPBOX_ACTION' => mx_append_sid( $this->this_mxurl( ) ), ! 'BLOCK_PAGINATION' => mx_generate_pagination(mx_append_sid( $this->this_mxurl( 'cat=' . $cat_id, false, false ) ), $total_num_items, $mini_config['mini_pagination'], $start, true, true, true, false, 'mini_start'), )); } Index: kb_article.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_article.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** kb_article.php 5 Jun 2007 21:21:51 -0000 1.15 --- kb_article.php 9 Sep 2007 20:06:01 -0000 1.16 *************** *** 90,94 **** 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 ); } --- 90,94 ---- 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="' . mx_append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . mx_append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 103,107 **** $author_id = $kb_row['article_author_id']; $approved = $kb_row['approved']; ! $date = create_date( $board_config['default_dateformat'], $kb_row['article_date'], $board_config['board_timezone'] ); $article_type = isset($lang['KB_type_' . $kb_row['type']]) ? $lang['KB_type_' . $kb_row['type']] : $kb_row['type']; --- 103,107 ---- $author_id = $kb_row['article_author_id']; $approved = $kb_row['approved']; ! $date = phpBB2::create_date( $board_config['default_dateformat'], $kb_row['article_date'], $board_config['board_timezone'] ); $article_type = isset($lang['KB_type_' . $kb_row['type']]) ? $lang['KB_type_' . $kb_row['type']] : $kb_row['type']; *************** *** 177,181 **** // 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>'; --- 177,181 ---- // Format text and data // ! $temp_url = mx_append_sid( $this->this_mxurl( "mode=cat&cat=$article_category_id" ) ); $category = '<a href="' . $temp_url . '" class="gensmall">' . $article_category_name . '</a>'; *************** *** 187,191 **** { $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>'; } --- 187,191 ---- { $author_name = $kb_row['username']; ! $temp_url = mx_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>'; } *************** *** 209,213 **** 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>'; --- 209,213 ---- if ( ( $userdata['user_id'] == $author_id && $this->auth_user[$article_category_id]['auth_edit'] ) || $this->auth_user[$article_category_id]['auth_mod'] ) { ! $temp_url = mx_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>'; *************** *** 224,228 **** if ( ( $userdata['user_id'] == $author_id && $this->auth_user[$article_category_id]['auth_delete'] ) || $this->auth_user[$article_category_id]['auth_mod'] ) { ! $temp_url = append_sid( $this->this_mxurl( "mode=edit&do=delete&k=" . $article_id ) ); $delete_img = '<a href="javascript:delete_item(\'' . $temp_url . '\')"><img src="' . $images['kb_icon_delpost'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>'; $delete = '<a href="javascript:delete_item(\'' . $temp_url . '\')">' . $lang['Edit_delete_post'] . '</a>'; --- 224,228 ---- if ( ( $userdata['user_id'] == $author_id && $this->auth_user[$article_category_id]['auth_delete'] ) || $this->auth_user[$article_category_id]['auth_mod'] ) { ! $temp_url = mx_append_sid( $this->this_mxurl( "mode=edit&do=delete&k=" . $article_id ) ); $delete_img = '<a href="javascript:delete_item(\'' . $temp_url . '\')"><img src="' . $images['kb_icon_delpost'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>'; $delete = '<a href="javascript:delete_item(\'' . $temp_url . '\')">' . $lang['Edit_delete_post'] . '</a>'; *************** *** 239,243 **** if ( !$this->auth_user[$article_category_id]['auth_view'] || !$article_title || ( !$approved && !$this->auth_user[$article_category_id]['auth_mod'] ) ) { ! $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 ); } --- 239,243 ---- if ( !$this->auth_user[$article_category_id]['auth_view'] || !$article_title || ( !$approved && !$this->auth_user[$article_category_id]['auth_mod'] ) ) { ! $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . mx_append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . mx_append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 267,271 **** } ! $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( --- 267,271 ---- } ! $print_url = mx_append_sid( $this->this_mxurl( "mode=article&k=" . $article_id ."&page_num=".($page_num+1)."&start=".$start ."&print=true", true ) ); $template->assign_vars( array( *************** *** 327,331 **** if( $page_num != $i ) { ! $temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&mode=article&k=$article_id&page_num=$page_number" . $xtra_dynamic); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } --- 327,331 ---- if( $page_num != $i ) { ! $temp_url = mx_append_sid(PORTAL_URL . "index.php?page=$page_id&mode=article&k=$article_id&page_num=$page_number" . $xtra_dynamic); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } *************** *** 363,371 **** 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>'; --- 363,371 ---- if ( !$print_version ) { ! $temp_url = mx_append_sid( $this->this_mxurl( "mode=article&k=$article_id&page_num=$page_number" . $start_pag . $original_highlight) ); } else { ! $temp_url = mx_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>'; *************** *** 418,422 **** // 'RATE_IMG' => $rate_img, ! 'U_RATE' => append_sid( $this->this_mxurl( 'mode=rate&k=' . $article_id ) ), )); } --- 418,422 ---- // 'RATE_IMG' => $rate_img, ! 'U_RATE' => mx_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.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** kb_search.php 5 Jun 2007 21:21:51 -0000 1.9 --- kb_search.php 9 Sep 2007 20:06:02 -0000 1.10 *************** *** 553,562 **** 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 // =================================================== ! $date = create_date( $board_config['default_dateformat'], $searchset[$i]['article_date'], $board_config['board_timezone'] ); // =================================================== // Get rating for the article and format it --- 553,562 ---- for( $i = 0; $i < count( $searchset ); $i++ ) { ! $cat_url = mx_append_sid( $this->this_mxurl( 'mode=cat&cat=' . $searchset[$i]['category_id'] ) ); ! $file_url = mx_append_sid( $this->this_mxurl( 'mode=article&k=' . $searchset[$i]['article_id'] ) ); // =================================================== // Format the date for the given article // =================================================== ! $date = phpBB2::create_date( $board_config['default_dateformat'], $searchset[$i]['article_date'], $board_config['board_timezone'] ); // =================================================== // Get rating for the article and format it *************** *** 567,571 **** // =================================================== ! $poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $searchset[$i]['user_id'] ) . '">' : ''; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : $lang['Guest']; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : ''; --- 567,571 ---- // =================================================== ! $poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . mx_append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $searchset[$i]['user_id'] ) . '">' : ''; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : $lang['Guest']; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : ''; *************** *** 585,597 **** ); } ! $base_url = append_sid( $this->this_mxurl( "mode=search&search_id=$search_id" ) ); $template->assign_vars( array( ! 'PAGINATION' => generate_pagination( $base_url, $total_match_count, $kb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $kb_config['pagination'] ) + 1 ), ceil( $total_match_count / $kb_config['pagination'] ) ), 'L_MODULE' => $kb_config['module_name'], ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'L_INDEX' => "<<", --- 585,597 ---- ); } ! $base_url = mx_append_sid( $this->this_mxurl( "mode=search&search_id=$search_id" ) ); $template->assign_vars( array( ! 'PAGINATION' => phpBB2::generate_pagination( $base_url, $total_match_count, $kb_config['pagination'], $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $kb_config['pagination'] ) + 1 ), ceil( $total_match_count / $kb_config['pagination'] ) ), 'L_MODULE' => $kb_config['module_name'], ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => mx_append_sid( $this->this_mxurl() ), 'L_INDEX' => "<<", *************** *** 620,630 **** $template->assign_vars( array( ! 'S_SEARCH_ACTION' => append_sid( $this->this_mxurl() ), 'S_CAT_MENU' => $dropmenu, 'L_MODULE' => $kb_config['module_name'], ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'L_YES' => $lang['Yes'], --- 620,630 ---- $template->assign_vars( array( ! 'S_SEARCH_ACTION' => mx_append_sid( $this->this_mxurl() ), 'S_CAT_MENU' => $dropmenu, 'L_MODULE' => $kb_config['module_name'], ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => mx_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.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kb_rate.php 4 Aug 2006 16:30:30 -0000 1.8 --- kb_rate.php 9 Sep 2007 20:06:02 -0000 1.9 *************** *** 72,78 **** 'L_RATE' => $lang['Rate'], ! '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'], --- 72,78 ---- 'L_RATE' => $lang['Rate'], ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => mx_append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => mx_append_sid( $this->this_mxurl( 'mode=article&k=' . $article_id ) ), 'FILE_NAME' => $article_data['file_name'], *************** *** 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( "mode=article&k=$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=\"" . mx_append_sid( $this->this_mxurl( "mode=article&k=$article_id" ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 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'], --- 105,109 ---- $template->assign_vars( array( ! 'S_RATE_ACTION' => mx_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.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kb_cat.php 4 Aug 2006 20:10:43 -0000 1.8 --- kb_cat.php 9 Sep 2007 20:06:01 -0000 1.9 *************** *** 109,113 **** 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)); } --- 109,113 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=". $this->this_mxurl("mode=cat&cat=" . $cat_id, true), true)); } *************** *** 118,122 **** 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 ); } --- 118,122 ---- if ( !isset( $this->cat_rowset[$category_id] ) ) { ! $message = $lang['Category_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . mx_append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . mx_append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 143,147 **** $template->assign_vars( array( ! 'U_CAT' => append_sid( $this->this_mxurl( 'mode=cat&cat=' . $category_id ) ) ) ); --- 143,147 ---- $template->assign_vars( array( ! 'U_CAT' => mx_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.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** kb_post_comment.php 13 Aug 2006 19:43:07 -0000 1.10 --- kb_post_comment.php 9 Sep 2007 20:06:02 -0000 1.11 *************** *** 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)); } --- 70,74 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=post_comment&item_id=" . $item_id), true)); } *************** *** 181,185 **** $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 ); } --- 181,185 ---- $this->_kb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . mx_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->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="' . mx_append_sid( $this->this_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 284,288 **** $template->assign_vars( array( 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, 'LINKS_STATUS' => $links_status, --- 284,288 ---- $template->assign_vars( array( 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . mx_append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, 'LINKS_STATUS' => $links_status, *************** *** 353,360 **** 'L_STYLES_TIP' => $lang['Styles_tip'], ! '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 ) ); --- 353,360 ---- 'L_STYLES_TIP' => $lang['Styles_tip'], ! 'U_INDEX' => mx_append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => mx_append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => mx_append_sid( $this->this_mxurl( 'mode=article&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => mx_append_sid( $this->this_mxurl() ), 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ); |
