From 8ee977f1d1cfbf86ed3938da710c00ca9ad40c44 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 30 Jan 2003 15:54:27 +0000 Subject: [PATCH] Case changes, fix forum_id in nav, fix forum_id in posting success msg git-svn-id: file:///svn/phpbb/trunk@3422 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 4 ++-- phpBB/includes/functions_display.php | 2 +- phpBB/posting.php | 2 +- phpBB/viewforum.php | 19 ++++++++++++------- phpBB/viewtopic.php | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 389d5d122c..d760bf83d0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -144,11 +144,11 @@ function generate_forum_nav(&$forum_data) } $template->assign_block_vars('navlinks', array( 'FORUM_NAME' => $forum_data['forum_name'], - 'U_VIEW_FORUM' => 'viewforum.' . $phpEx . $SID . '&f=' . $forum_id + 'U_VIEW_FORUM' => 'viewforum.' . $phpEx . $SID . '&f=' . $forum_data['forum_id'] )); $template->assign_vars(array( - 'FORUM_ID' => $forum_id, + 'FORUM_ID' => $forum_data['forum_id'], 'FORUM_NAME' => $forum_data['forum_name'], 'FORUM_DESC' => strip_tags($forum_data['forum_desc']) )); diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index bb987fcbf1..16228dee88 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -175,7 +175,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) { $last_post = $user->format_date($row['forum_last_post_time']) . '
'; - $last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '' . $row['forum_last_poster_name'] . ' '; + $last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : '' . $row['forum_last_poster_name'] . ' '; $last_post .= '' . $user->img('goto_post_latest', 'View_latest_post') . ''; } diff --git a/phpBB/posting.php b/phpBB/posting.php index 85309d8928..a8d69b8746 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -524,7 +524,7 @@ if (isset($_REQUEST['post'])) ); $message = (!empty($enable_moderate)) ? 'POST_STORED_MOD' : 'POST_STORED'; - $message = $user->lang[$message] . '

' . sprintf($user->lang['Click_view_message'], '', '') . '

' . sprintf($user->lang['Click_return_forum'], '', ''); + $message = $user->lang[$message] . '

' . sprintf($user->lang['Click_view_message'], '', '') . '

' . sprintf($user->lang['Click_return_forum'], '', ''); trigger_error($message); } // Store message, sync counters diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 91803c18e8..63c83fe131 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -139,7 +139,7 @@ if ($forum_data['forum_postable']) // End handle marking posts // Do the forum Prune - if ($config['prune_enable'] && $auth->acl_gets('m_prune', 'a_', $forum_id)) + if ($config['prune_enable'] && $auth->acl_get('a_')) { if ($forum_data['prune_next'] < time() && $forum_data['prune_enable']) { @@ -162,9 +162,12 @@ if ($forum_data['forum_postable']) $censors = array(); obtain_word_list($censors); + + + // Topic ordering options - $previous_days = array(0 => $user->lang['All_Topics'], 1 => $user->lang['1_Day'], 7 => $user->lang['7_Days'], 14 => $user->lang['2_Weeks'], 30 => $user->lang['1_Month'], 90 => $user->lang['3_Months'], 180 => $user->lang['6_Months'], 364 => $user->lang['1_Year']); - $sort_by_text = array('a' => $user->lang['Author'], 't' => $user->lang['Post_time'], 'r' => $user->lang['Replies'], 's' => $user->lang['Subject'], 'v' => $user->lang['Views']); + $previous_days = array(0 => $user->lang['All_Topics'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 364 => $user->lang['1_YEAR']); + $sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']); $sort_by = array('a' => 'u.username', 't' => 't.topic_last_post_id', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views'); if (isset($_POST['sort'])) @@ -215,9 +218,11 @@ if ($forum_data['forum_postable']) $select_sort .= ''; $select_sort_dir = ''; + + $post_alt = (intval($forum_data['forum_status']) == ITEM_LOCKED) ? 'Forum_locked' : 'Post_new_topic'; // Basic pagewide vars @@ -227,7 +232,7 @@ if ($forum_data['forum_postable']) 'PAGINATION' => generate_pagination("viewforum.$phpEx$SID&f=$forum_id&topicdays=$topic_days", $topics_count, $config['topics_per_page'], $start), 'PAGE_NUMBER' => sprintf($user->lang['Page_of'], (floor( $start / $config['topics_per_page'] ) + 1), ceil( $topics_count / $config['topics_per_page'] )), 'MOD_CP' => ($auth->acl_gets('m_', 'a_', $forum_id)) ? sprintf($user->lang['MCP'], '', '') : '', - 'MODERATORS' => (sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : $user->lang['None'], + 'MODERATORS' => (sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : $user->lang['NONE'], 'FOLDER_IMG' => $user->img('folder', 'No_new_posts'), 'FOLDER_NEW_IMG' => $user->img('folder_new', 'New_posts'), @@ -461,7 +466,7 @@ if ($forum_data['forum_postable']) $view_topic_url = 'viewtopic.' . $phpEx . $SID . '&f=' . $forum_id . '&t=' . $topic_id; $topic_author = ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? '' : ''; - $topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? $topic_rowset[$i]['username'] : (($topic_rowset[$i]['topic_first_poster_name'] != '') ? $topic_rowset[$i]['topic_first_poster_name'] : $user->lang['Guest']); + $topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? $topic_rowset[$i]['username'] : (($topic_rowset[$i]['topic_first_poster_name'] != '') ? $topic_rowset[$i]['topic_first_poster_name'] : $user->lang['GUEST']); $topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? '' : ''; @@ -469,7 +474,7 @@ if ($forum_data['forum_postable']) $last_post_time = $user->format_date($topic_rowset[$i]['topic_last_post_time']); - $last_post_author = ($topic_rowset[$i]['id2'] == ANONYMOUS) ? (($topic_rowset[$i]['topic_last_poster_name'] != '') ? $topic_rowset[$i]['topic_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '' . $topic_rowset[$i]['user2'] . ''; + $last_post_author = ($topic_rowset[$i]['id2'] == ANONYMOUS) ? (($topic_rowset[$i]['topic_last_poster_name'] != '') ? $topic_rowset[$i]['topic_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : '' . $topic_rowset[$i]['user2'] . ''; $last_post_url = '' . $user->img('goto_post_latest', 'View_latest_post') . ''; diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 8d1223f1ce..2a8b73f191 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -360,7 +360,7 @@ $template->assign_vars(array( 'PAGINATION' => $pagination, 'PAGE_NUMBER' => on_page($topic_replies, $config['posts_per_page'], $start), 'MCP' => ($auth->acl_gets('m_', 'a_', $forum_id)) ? sprintf($user->lang['MCP'], '', '') : '', - 'MODERATORS' => (sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : $user->lang['None'], + 'MODERATORS' => (sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : $user->lang['NONE'], 'POST_IMG' => $post_img, 'REPLY_IMG' => $reply_img,