Menu
▾
▴
[mxbb-commits] core/modules/mx_phpbb2blocks mx_announce.php, 1.3, 1.4 mx_forum.php, 1.4, 1.5 mx_last_msg.php, 1.4, 1.5 mx_poll.php, 1.3, 1.4 mx_statistics.php, 1.3, 1.4
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:43
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9427/mx_phpbb2blocks Modified Files: mx_announce.php mx_forum.php mx_last_msg.php mx_poll.php mx_statistics.php Log Message: Ok, massive update for 2.9.x. Index: mx_poll.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_poll.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_poll.php 5 May 2007 20:13:40 -0000 1.3 --- mx_poll.php 9 Sep 2007 16:49:36 -0000 1.4 *************** *** 36,40 **** $forum_lst_poll = $mx_block->get_parameters( 'poll_forum' ); ! $auth_data_sql_poll = get_auth_forum(); if ( empty($forum_lst_poll) ) --- 36,40 ---- $forum_lst_poll = $mx_block->get_parameters( 'poll_forum' ); ! $auth_data_sql_poll = $phpbb_auth->get_auth_forum(); if ( empty($forum_lst_poll) ) *************** *** 141,147 **** $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult") . '">') ); ! $message .= '<br /><br />' . sprintf($lang['Click_view_voted'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult") . '">', '</a>'); mx_block_message($lang['Surveys_Polls'], $message); --- 141,147 ---- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult") . '">') ); ! $message .= '<br /><br />' . sprintf($lang['Click_view_voted'], '<a href="' . mx_append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult") . '">', '</a>'); mx_block_message($lang['Surveys_Polls'], $message); *************** *** 250,254 **** 'L_TOTAL_VOTES' => $lang['Total_votes'], 'TOTAL_VOTES' => $vote_results_sum, ! 'U_URL' => append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); --- 250,254 ---- 'L_TOTAL_VOTES' => $lang['Total_votes'], 'TOTAL_VOTES' => $vote_results_sum, ! 'U_URL' => mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); *************** *** 278,283 **** 'L_SUBMIT_VOTE' => $lang['Submit_vote'], 'L_VIEW_RESULTS' => $lang['View_results'], ! 'U_VIEW_RESULTS' => append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult"), ! 'U_URL' => append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); --- 278,283 ---- 'L_SUBMIT_VOTE' => $lang['Submit_vote'], 'L_VIEW_RESULTS' => $lang['View_results'], ! 'U_VIEW_RESULTS' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult"), ! 'U_URL' => mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); *************** *** 299,303 **** 'VOTE_RCAP' => $images['mx_vote_rcap'], 'S_HIDDEN_FIELDS' => ( !empty($s_hidden_fields) ? $s_hidden_fields : '' ), ! 'S_POLL_ACTION' => append_sid(PORTAL_URL . "index.$phpEx?page=$current_page")) ); --- 299,303 ---- 'VOTE_RCAP' => $images['mx_vote_rcap'], 'S_HIDDEN_FIELDS' => ( !empty($s_hidden_fields) ? $s_hidden_fields : '' ), ! 'S_POLL_ACTION' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$current_page")) ); Index: mx_statistics.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_statistics.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_statistics.php 5 May 2007 20:13:41 -0000 1.3 --- mx_statistics.php 9 Sep 2007 16:49:36 -0000 1.4 *************** *** 125,129 **** // Authorization SQL // ! $auth_data_sql_stats = get_auth_forum(); // --- 125,129 ---- // Authorization SQL // ! $auth_data_sql_stats = $phpbb_auth->get_auth_forum(); // *************** *** 187,191 **** $firstcount = $user_data[0]['user_posts']; ! $get_db_stats = get_db_stat( 'postcount' ); for( $i = 0; $i < $user_count; $i++ ) --- 187,191 ---- $firstcount = $user_data[0]['user_posts']; ! $get_db_stats = phpBB2::get_db_stat( 'postcount' ); for( $i = 0; $i < $user_count; $i++ ) *************** *** 199,203 **** "PERCENTAGE" => $percentage, "BAR" => $bar_percent, ! "URL" => append_sid(PHPBB_URL . "profile.php?mode=viewprofile&u=" . $user_data[$i]['user_id']), "POSTS" => $user_data[$i]['user_posts']) ); --- 199,203 ---- "PERCENTAGE" => $percentage, "BAR" => $bar_percent, ! "URL" => mx_append_sid(PHPBB_URL . "profile.php?mode=viewprofile&u=" . $user_data[$i]['user_id']), "POSTS" => $user_data[$i]['user_posts']) ); *************** *** 229,233 **** "TITLE" => $topic_data[$i]['topic_title'], "REPLIES" => $topic_data[$i]['topic_replies'], ! "URL" => append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } --- 229,233 ---- "TITLE" => $topic_data[$i]['topic_title'], "REPLIES" => $topic_data[$i]['topic_replies'], ! "URL" => mx_append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } *************** *** 259,263 **** "TITLE" => $topic_data[$i]['topic_title'], "VIEWS" => $topic_data[$i]['topic_views'], ! "URL" => append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } --- 259,263 ---- "TITLE" => $topic_data[$i]['topic_title'], "VIEWS" => $topic_data[$i]['topic_views'], ! "URL" => mx_append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } *************** *** 271,278 **** // $total_posts = $get_db_stats; //Already queried above ! $total_users = get_db_stat('usercount'); ! $total_topics = get_db_stat('topiccount'); ! $start_date = create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; --- 271,278 ---- // $total_posts = $get_db_stats; //Already queried above ! $total_users = phpBB2::get_db_stat('usercount'); ! $total_topics = phpBB2::get_db_stat('topiccount'); ! $start_date = phpBB2::create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; *************** *** 429,433 **** // Newest user data // ! $newest_userdata = get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; --- 429,433 ---- // Newest user data // ! $newest_userdata = phpBB2::get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; *************** *** 455,464 **** } $row = $db->sql_fetchrow($result); ! $most_users_date = ( $row['config_value'] > 0 ) ? create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $lang['Not_available']; $row = $db->sql_fetchrow($result); $most_users = ( $row['config_value'] > 0 ) ? $row['config_value'] : $lang['Not_available']; $statistic_array = array($lang['Number_posts'], $lang['Posts_per_day'], $lang['Number_topics'], $lang['Topics_per_day'], $lang['Number_users'], $lang['Users_per_day'], $lang['Board_started'], $lang['Board_Up_Days'], $lang['Database_size'], $lang['Avatar_dir_size'], $lang['Latest_Reg_User_Date'], $lang['Latest_Reg_User'], $lang['Most_Ever_Online_Date'], $lang['Most_Ever_Online'], $lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf('<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">' . $newest_user . '</a>'), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); // --- 455,464 ---- } $row = $db->sql_fetchrow($result); ! $most_users_date = ( $row['config_value'] > 0 ) ? phpBB2::create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $lang['Not_available']; $row = $db->sql_fetchrow($result); $most_users = ( $row['config_value'] > 0 ) ? $row['config_value'] : $lang['Not_available']; $statistic_array = array($lang['Number_posts'], $lang['Posts_per_day'], $lang['Number_topics'], $lang['Topics_per_day'], $lang['Number_users'], $lang['Users_per_day'], $lang['Board_started'], $lang['Board_Up_Days'], $lang['Database_size'], $lang['Avatar_dir_size'], $lang['Latest_Reg_User_Date'], $lang['Latest_Reg_User'], $lang['Most_Ever_Online_Date'], $lang['Most_Ever_Online'], $lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, phpBB2::create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf('<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">' . $newest_user . '</a>'), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); // Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_last_msg.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_last_msg.php 5 Jun 2007 21:20:34 -0000 1.4 --- mx_last_msg.php 9 Sep 2007 16:49:36 -0000 1.5 *************** *** 54,58 **** // Authorization SQL // ! $auth_data_sql_msg = get_auth_forum(); if ( empty($forum_lst_msg) ) --- 54,58 ---- // Authorization SQL // ! $auth_data_sql_msg = $phpbb_auth->get_auth_forum(); if ( empty($forum_lst_msg) ) *************** *** 175,179 **** 'U_ALIGN' => $align, 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'U_URL' => append_sid(PORTAL_URL . 'index.php' . '?block_id=' . $block_id), 'U_URL_NEXT' => $url_next, 'U_URL_PREV' => $url_prev, --- 175,179 ---- 'U_ALIGN' => $align, 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'U_URL' => mx_append_sid(PORTAL_URL . 'index.php' . '?block_id=' . $block_id), 'U_URL_NEXT' => $url_next, 'U_URL_PREV' => $url_prev, *************** *** 200,204 **** $message = $postrow[$row_count]['topic_title']; ! $url = append_sid(PHPBB_URL . 'viewtopic.php?'. 'lmsg_start=' . $msg_start . '&t=' . $postrow[$row_count]['topic_id'] . '#' . $postrow[$row_count]['topic_last_post_id']); if ( $postrow[$row_count]['topic_status'] == TOPIC_MOVED ) --- 200,204 ---- $message = $postrow[$row_count]['topic_title']; ! $url = mx_append_sid(PHPBB_URL . 'viewtopic.php?'. 'lmsg_start=' . $msg_start . '&t=' . $postrow[$row_count]['topic_id'] . '#' . $postrow[$row_count]['topic_last_post_id']); if ( $postrow[$row_count]['topic_status'] == TOPIC_MOVED ) *************** *** 283,287 **** $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['last_msg_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else --- 283,287 ---- $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['last_msg_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else *************** *** 298,302 **** $folder_alt = ( $postrow[$row_count]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['last_msg_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } --- 298,302 ---- $folder_alt = ( $postrow[$row_count]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['last_msg_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } *************** *** 320,324 **** if ( $display_author == "TRUE" ) { ! $topic_author = ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['user_id']) . '" class="gensmall">' : ''; $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? $postrow[$row_count]['username'] : ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] : $lang['Guest'] ); $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '</a>' : ''; --- 320,324 ---- if ( $display_author == "TRUE" ) { ! $topic_author = ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['user_id']) . '" class="gensmall">' : ''; $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? $postrow[$row_count]['username'] : ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] : $lang['Guest'] ); $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '</a>' : ''; *************** *** 331,335 **** if ( $display_last_author == "TRUE" ) { ! $last_post_author = ( $postrow[$row_count]['id2'] == ANONYMOUS ) ? ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['id2']) . '" class="gensmall">' . $postrow[$row_count]['user2'] . '</a>'; } else --- 331,335 ---- if ( $display_last_author == "TRUE" ) { ! $last_post_author = ( $postrow[$row_count]['id2'] == ANONYMOUS ) ? ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['id2']) . '" class="gensmall">' . $postrow[$row_count]['user2'] . '</a>'; } else *************** *** 351,355 **** if ( $display_date == "TRUE" ) { ! $message_date = create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'], $board_config['board_timezone']); } else --- 351,355 ---- if ( $display_date == "TRUE" ) { ! $message_date = phpBB2::create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'], $board_config['board_timezone']); } else *************** *** 373,377 **** } ! $forum_url = append_sid(PHPBB_URL . 'viewforum.php?'. 'lmsg_start=' . $msg_start . '&f=' . $postrow[$row_count]['forum_id']); } else --- 373,377 ---- } ! $forum_url = mx_append_sid(PHPBB_URL . 'viewforum.php?'. 'lmsg_start=' . $msg_start . '&f=' . $postrow[$row_count]['forum_id']); } else *************** *** 383,387 **** if ( $display_icon_view == "TRUE" ) { ! $last_post_url = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?". "lmsg_start=" . $msg_start . "&" . POST_POST_URL . '=' . $postrow[$row_count]['topic_last_post_id']) . '#' . $postrow[$row_count]['topic_last_post_id'] . '"><img src="' . $images['last_msg_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; } else --- 383,387 ---- if ( $display_icon_view == "TRUE" ) { ! $last_post_url = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?". "lmsg_start=" . $msg_start . "&" . POST_POST_URL . '=' . $postrow[$row_count]['topic_last_post_id']) . '#' . $postrow[$row_count]['topic_last_post_id'] . '"><img src="' . $images['last_msg_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; } else Index: mx_announce.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_announce.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_announce.php 5 May 2007 20:13:40 -0000 1.3 --- mx_announce.php 9 Sep 2007 16:49:36 -0000 1.4 *************** *** 75,79 **** // Authorization SQL // ! $auth_data_sql = get_auth_forum(); if ( empty($announce_forum) ) { --- 75,80 ---- // Authorization SQL // ! $auth_data_sql = $phpbb_auth->get_auth_forum(); ! if ( empty($announce_forum) ) { *************** *** 142,146 **** $poster_id = $postrow[$i]['user_id']; $poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $postrow[$i]['username']; ! $post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']); $title = $postrow[$i]['topic_title']; --- 143,147 ---- $poster_id = $postrow[$i]['user_id']; $poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $postrow[$i]['username']; ! $post_date = phpBB2::create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']); $title = $postrow[$i]['topic_title']; *************** *** 265,269 **** $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['mx_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else --- 266,270 ---- $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['mx_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else *************** *** 280,284 **** $folder_alt = ( $postrow[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['mx_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } --- 281,285 ---- $folder_alt = ( $postrow[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['mx_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } *************** *** 302,312 **** $replies = $postrow[$i]['topic_replies']; $views = $postrow[$i]['topic_views']; ! $first_post_time = create_date($board_config['default_dateformat'], $postrow[$i]['topic_time'], $board_config['board_timezone']); ! $last_post_time = create_date($board_config['default_dateformat'], $postrow[$i]['last_post_time'], $board_config['board_timezone']); ! $last_post_author = ( $postrow[$i]['id2'] == ANONYMOUS ) ? ( ( $postrow[$i]['post_username2'] != '' ) ? $postrow[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$i]['id2']) . '">' . $postrow[$i]['user2'] . '</a>'; ! $last_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id']) . '#' . $postrow[$i]['topic_last_post_id'] . '"><img src="' . $images['mx_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; ! $last_post_url = append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id'] . '#' . $postrow[$i]['topic_last_post_id']); $template->assign_block_vars("postrow", array( --- 303,313 ---- $replies = $postrow[$i]['topic_replies']; $views = $postrow[$i]['topic_views']; ! $first_post_time = phpBB2::create_date($board_config['default_dateformat'], $postrow[$i]['topic_time'], $board_config['board_timezone']); ! $last_post_time = phpBB2::create_date($board_config['default_dateformat'], $postrow[$i]['last_post_time'], $board_config['board_timezone']); ! $last_post_author = ( $postrow[$i]['id2'] == ANONYMOUS ) ? ( ( $postrow[$i]['post_username2'] != '' ) ? $postrow[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$i]['id2']) . '">' . $postrow[$i]['user2'] . '</a>'; ! $last_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id']) . '#' . $postrow[$i]['topic_last_post_id'] . '"><img src="' . $images['mx_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; ! $last_post_url = mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id'] . '#' . $postrow[$i]['topic_last_post_id']); $template->assign_block_vars("postrow", array( *************** *** 322,328 **** 'IMAGE' => $module_root_path . TEMPLATE_ROOT_PATH . 'images/' . $annoucement_image, ! 'U_TOPIC_URL' => append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $postrow[$i]['topic_id']), 'U_LAST_POST_URL' => $last_post_url, ! 'U_PROFILE_POSTER' => append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&u=$poster_id"), 'REPLIES' => $replies, --- 323,329 ---- 'IMAGE' => $module_root_path . TEMPLATE_ROOT_PATH . 'images/' . $annoucement_image, ! 'U_TOPIC_URL' => mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $postrow[$i]['topic_id']), 'U_LAST_POST_URL' => $last_post_url, ! 'U_PROFILE_POSTER' => mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&u=$poster_id"), 'REPLIES' => $replies, Index: mx_forum.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_forum.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_forum.php 5 May 2007 20:13:40 -0000 1.4 --- mx_forum.php 9 Sep 2007 16:49:36 -0000 1.5 *************** *** 54,61 **** $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "index.$phpEx") . '">' ) ); ! $message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx") . '">', '</a> '); mx_message_die(GENERAL_MESSAGE, $message); --- 54,61 ---- $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(PORTAL_URL . "index.$phpEx") . '">' ) ); ! $message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid(PORTAL_URL . "index.$phpEx") . '">', '</a> '); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 73,79 **** // /* ! $total_posts = get_db_stat('postcount'); ! $total_users = get_db_stat('usercount'); ! $newest_userdata = get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; --- 73,79 ---- // /* ! $total_posts = phpBB2::get_db_stat('postcount'); ! $total_users = phpBB2::get_db_stat('usercount'); ! $newest_userdata = phpBB2::get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; *************** *** 223,227 **** while( $row = $db->sql_fetchrow($result) ) { ! $forum_moderators[$row['forum_id']][] = '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $row['username'] . '</a>'; } $db->sql_freeresult($result); --- 223,227 ---- while( $row = $db->sql_fetchrow($result) ) { ! $forum_moderators[$row['forum_id']][] = '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $row['username'] . '</a>'; } $db->sql_freeresult($result); *************** *** 243,247 **** while( $row = $db->sql_fetchrow($result) ) { ! $forum_moderators[$row['forum_id']][] = '<a href="' . append_sid(PHPBB_URL . "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id']) . '">' . $row['group_name'] . '</a>'; } $db->sql_freeresult($result); --- 243,247 ---- while( $row = $db->sql_fetchrow($result) ) { ! $forum_moderators[$row['forum_id']][] = '<a href="' . mx_append_sid(PHPBB_URL . "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id']) . '">' . $row['group_name'] . '</a>'; } $db->sql_freeresult($result); *************** *** 256,260 **** */ // Fix, using the cached auth data ! $auth_data_sql = get_auth_forum(); $is_auth_tmp = explode(',', $auth_data_sql); --- 256,260 ---- */ // Fix, using the cached auth data ! $auth_data_sql = $phpbb_auth->get_auth_forum(); $is_auth_tmp = explode(',', $auth_data_sql); *************** *** 283,287 **** //'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), //'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! //'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), 'FORUM_IMG' => $images['mx_forum'], --- 283,287 ---- //'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), //'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! //'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), 'FORUM_IMG' => $images['mx_forum'], *************** *** 305,310 **** 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], ! //'U_MARK_READ' => append_sid(PORTAL_URL . "modules/mx_coreblocks/mx_forum.$phpEx?mark=forums")) ! 'U_MARK_READ' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $page_id . '&mark=forums')) ); --- 305,310 ---- 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], ! //'U_MARK_READ' => mx_append_sid(PORTAL_URL . "modules/mx_coreblocks/mx_forum.$phpEx?mark=forums")) ! 'U_MARK_READ' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $page_id . '&mark=forums')) ); *************** *** 339,343 **** 'CAT_ID' => $cat_id, 'CAT_DESC' => $category_rows[$i]['cat_title'], ! 'U_VIEWCAT' => append_sid(PHPBB_URL . "index.$phpEx?" . POST_CAT_URL . "=$cat_id")) ); --- 339,343 ---- 'CAT_ID' => $cat_id, 'CAT_DESC' => $category_rows[$i]['cat_title'], ! 'U_VIEWCAT' => mx_append_sid(PHPBB_URL . "index.$phpEx?" . POST_CAT_URL . "=$cat_id")) ); *************** *** 413,423 **** if ( $forum_data[$j]['forum_last_post_id'] ) { ! $last_post_time = create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']); $last_post = $last_post_time . '<br />'; ! $last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> '; ! $last_post .= '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['mx_icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; } else --- 413,423 ---- if ( $forum_data[$j]['forum_last_post_id'] ) { ! $last_post_time = phpBB2::create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']); $last_post = $last_post_time . '<br />'; ! $last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> '; ! $last_post .= '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['mx_icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; } else *************** *** 454,458 **** 'L_FORUM_FOLDER_ALT' => $folder_alt, ! 'U_VIEWFORUM' => append_sid(PHPBB_URL . "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) ); } --- 454,458 ---- 'L_FORUM_FOLDER_ALT' => $folder_alt, ! 'U_VIEWFORUM' => mx_append_sid(PHPBB_URL . "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) ); } |
