Menu
▾
▴
[mxbb-commits] mx_newssuite/includes news.php, 1.20, 1.21 newssuite_functions.php, 1.3, 1.4
|
From: Jon O. <jon...@us...> - 2007-09-09 20:12:50
|
Update of /cvsroot/mxbb/mx_newssuite/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21640/includes Modified Files: news.php newssuite_functions.php Log Message: for 2.9.x Index: news.php =================================================================== RCS file: /cvsroot/mxbb/mx_newssuite/includes/news.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** news.php 16 Aug 2006 20:29:45 -0000 1.20 --- news.php 9 Sep 2007 20:12:47 -0000 1.21 *************** *** 212,216 **** $orig_word = array(); $replacement_word = array(); ! obtain_word_list( $orig_word, $replacement_word ); // --- 212,216 ---- $orig_word = array(); $replacement_word = array(); ! phpBB2::obtain_word_list( $orig_word, $replacement_word ); // *************** *** 267,271 **** $l_edit_time_total = ( $news[$i]['post_edit_count'] == 1 ) ? $lang['Edited_time_total'] : $lang['Edited_times_total']; ! $l_edited_by = '<br />' . sprintf( $l_edit_time_total, $poster, create_date( $newssuite_config['default_dateformat'], $news[$i]['post_edit_time'], $board_config['board_timezone'] ), $news[$i]['post_edit_count'] ); } else --- 267,271 ---- $l_edit_time_total = ( $news[$i]['post_edit_count'] == 1 ) ? $lang['Edited_time_total'] : $lang['Edited_times_total']; ! $l_edited_by = '<br />' . sprintf( $l_edit_time_total, $poster, phpBB2::create_date( $newssuite_config['default_dateformat'], $news[$i]['post_edit_time'], $board_config['board_timezone'] ), $news[$i]['post_edit_count'] ); } else *************** *** 295,299 **** $message = explode( $newssuite_config['news_trim_char'], $message ); $message = $message[0]; ! $message .= ' <span> ... :: <a class="gensmall" href="' . append_sid( PHPBB_URL . "viewtopic.$phpEx?t=" . $news[$i]['topic_id'] ) . '">' . $lang['Read more'] . '</a> </span>'; } --- 295,299 ---- $message = explode( $newssuite_config['news_trim_char'], $message ); $message = $message[0]; ! $message .= ' <span> ... :: <a class="gensmall" href="' . mx_append_sid( PHPBB_URL . "viewtopic.$phpEx?t=" . $news[$i]['topic_id'] ) . '">' . $lang['Read more'] . '</a> </span>'; } *************** *** 348,359 **** $l_comment = ( num_of_replies( $i, $newssuite_config, $news ) == "1" ) ? strtolower( $lang['Comment'] ) : strtolower( $lang['Comments'] ); ! $poster_name = '<a class="gensmall" href="' . append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&u=" . $news[$i]['user_id'] ) . "\">$poster</a>"; ! $topic_time = create_date( $newssuite_config['news_time_format'], $news[$i][$item_time], $board_config['board_timezone'] ); $topic_type = $news[$i][$item_type]; ! $last_post_time = create_date( $newssuite_config['news_time_format'], $news[$i]['post_time'], $board_config['board_timezone'] ); ! $last_post_author = ( $news[$i]['id2'] == ANONYMOUS ) ? ( ( $news[$i]['post_username2'] != '' ) ? $news[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a class="gensmall" href="' . append_sid( $phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $news[$i]['id2'] ) . '">' . $news[$i]['user2'] . '</a>'; $folder = $images['newssuite_mini_message']; --- 348,359 ---- $l_comment = ( num_of_replies( $i, $newssuite_config, $news ) == "1" ) ? strtolower( $lang['Comment'] ) : strtolower( $lang['Comments'] ); ! $poster_name = '<a class="gensmall" href="' . mx_append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&u=" . $news[$i]['user_id'] ) . "\">$poster</a>"; ! $topic_time = phpBB2::create_date( $newssuite_config['news_time_format'], $news[$i][$item_time], $board_config['board_timezone'] ); $topic_type = $news[$i][$item_type]; ! $last_post_time = phpBB2::create_date( $newssuite_config['news_time_format'], $news[$i]['post_time'], $board_config['board_timezone'] ); ! $last_post_author = ( $news[$i]['id2'] == ANONYMOUS ) ? ( ( $news[$i]['post_username2'] != '' ) ? $news[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a class="gensmall" href="' . mx_append_sid( $phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $news[$i]['id2'] ) . '">' . $news[$i]['user2'] . '</a>'; $folder = $images['newssuite_mini_message']; *************** *** 689,693 **** 'TOTAL_VOTES' => $vote_results_sum, ! 'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id" ) ) ); --- 689,693 ---- 'TOTAL_VOTES' => $vote_results_sum, ! 'S_POLL_ACTION' => mx_append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id" ) ) ); *************** *** 732,738 **** 'S_HIDDEN_FIELDS' => '<input type="hidden" name="topic_id" value="' . $news[$i]['topic_id'] . '"><input type="hidden" name="mode" value="vote">', ! 'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . '=' . $news[$i]['topic_id'] ), ! 'U_VIEW_RESULTS' => append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&' . ( $cat_id ? POST_CAT_URL . '=' . $cat_id . '&' : '' ) . "vote=viewresult" ) ) ); --- 732,738 ---- 'S_HIDDEN_FIELDS' => '<input type="hidden" name="topic_id" value="' . $news[$i]['topic_id'] . '"><input type="hidden" name="mode" value="vote">', ! 'S_POLL_ACTION' => mx_append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . '=' . $news[$i]['topic_id'] ), ! 'U_VIEW_RESULTS' => mx_append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&' . ( $cat_id ? POST_CAT_URL . '=' . $cat_id . '&' : '' ) . "vote=viewresult" ) ) ); *************** *** 760,770 **** // Pagination // ! $read_home_url = append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&cat_start_' . $block_id . '=1' ); $temp_previous_url = ( $cat_start[$block_id] > 1 ? intval( $cat_start[$block_id] - $newssuite_config['news_items'] ) : '1' ); ! $read_previous_url = append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&cat_start_' . $block_id . '=' . $temp_previous_url ); $temp_next_url = intval( $cat_start[$block_id] + $newssuite_config['news_items'] ); ! $read_next_url = append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&cat_start_' . $block_id . '=' . $temp_next_url ); if ( $newssuite_config['news_items'] == 1 ) --- 760,770 ---- // Pagination // ! $read_home_url = mx_append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&cat_start_' . $block_id . '=1' ); $temp_previous_url = ( $cat_start[$block_id] > 1 ? intval( $cat_start[$block_id] - $newssuite_config['news_items'] ) : '1' ); ! $read_previous_url = mx_append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&cat_start_' . $block_id . '=' . $temp_previous_url ); $temp_next_url = intval( $cat_start[$block_id] + $newssuite_config['news_items'] ); ! $read_next_url = mx_append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&cat_start_' . $block_id . '=' . $temp_next_url ); if ( $newssuite_config['news_items'] == 1 ) Index: newssuite_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_newssuite/includes/newssuite_functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** newssuite_functions.php 26 Jun 2006 21:35:00 -0000 1.3 --- newssuite_functions.php 9 Sep 2007 20:12:47 -0000 1.4 *************** *** 21,29 **** { case 'phpbb': ! $tmp = append_sid( $phpbb_root_path . "viewtopic.$phpEx?p=" . $news[$i]['topic_last_post_id'] . "#" . $news[$i]['topic_last_post_id'] ); return $tmp; break; case 'kb': ! $tmp = append_sid( $phpbb_root_path . "viewtopic.$phpEx?t=" . $news[$i]['topic_id'] ); return $tmp; break; --- 21,29 ---- { case 'phpbb': ! $tmp = mx_append_sid( $phpbb_root_path . "viewtopic.$phpEx?p=" . $news[$i]['topic_last_post_id'] . "#" . $news[$i]['topic_last_post_id'] ); return $tmp; break; case 'kb': ! $tmp = mx_append_sid( $phpbb_root_path . "viewtopic.$phpEx?t=" . $news[$i]['topic_id'] ); return $tmp; break; *************** *** 36,44 **** { case 'phpbb': ! $tmp = append_sid( $phpbb_root_path . "viewtopic.$phpEx?t=" . $news[$i][$item_id] ); return $tmp; break; case 'kb': ! $tmp = append_sid( $mx_root_path . "modules/mx_kb/kb.$phpEx?mode=article&k=" . $news[$i][$item_id] ); return $tmp; break; --- 36,44 ---- { case 'phpbb': ! $tmp = mx_append_sid( $phpbb_root_path . "viewtopic.$phpEx?t=" . $news[$i][$item_id] ); return $tmp; break; case 'kb': ! $tmp = mx_append_sid( $mx_root_path . "modules/mx_kb/kb.$phpEx?mode=article&k=" . $news[$i][$item_id] ); return $tmp; break; *************** *** 51,59 **** { case 'phpbb': ! $tmp = append_sid( $phpbb_root_path . "viewforum.$phpEx?f=" . $news[$i][$item_cat_id] ); return $tmp; break; case 'kb': ! $tmp = append_sid( $mx_root_path . "modules/mx_kb/kb.$phpEx?mode=cat&cat=" . $news[$i][$item_cat_id] ); return $tmp; break; --- 51,59 ---- { case 'phpbb': ! $tmp = mx_append_sid( $phpbb_root_path . "viewforum.$phpEx?f=" . $news[$i][$item_cat_id] ); return $tmp; break; case 'kb': ! $tmp = mx_append_sid( $mx_root_path . "modules/mx_kb/kb.$phpEx?mode=cat&cat=" . $news[$i][$item_cat_id] ); return $tmp; break; *************** *** 82,90 **** { case 'phpbb': ! $tmp = '<br /> <a class="gensmall" href="' . append_sid( PHPBB_URL . "viewtopic.$phpEx?t=" . $news[$i][$item_id] ) . '">' . $lang['Read more'] . '</a>... '; return $tmp; break; case 'kb': ! $tmp = '<br /> <a class="gensmall" href="' . append_sid( $mx_root_path . "modules/mx_kb/kb.$phpEx?mode=article&k=" . $news[$i][$item_id] ) . '">' . $lang['Read more'] . '</a>... '; return $tmp; break; --- 82,90 ---- { case 'phpbb': ! $tmp = '<br /> <a class="gensmall" href="' . mx_append_sid( PHPBB_URL . "viewtopic.$phpEx?t=" . $news[$i][$item_id] ) . '">' . $lang['Read more'] . '</a>... '; return $tmp; break; case 'kb': ! $tmp = '<br /> <a class="gensmall" href="' . mx_append_sid( $mx_root_path . "modules/mx_kb/kb.$phpEx?mode=article&k=" . $news[$i][$item_id] ) . '">' . $lang['Read more'] . '</a>... '; return $tmp; break; |
