diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-03-13 00:40:28 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-03-13 00:40:28 +0000 |
| commit | f408ac052d5559ad776f42a817ab217b3fd3496b (patch) | |
| tree | 0eb54f5546145f005b78f3c42aef0e6f1e2bc167 /phpBB/viewforum.php | |
| parent | 4577cf61d1c8381aaa23a344290fd3b85a560370 (diff) | |
| download | forums-f408ac052d5559ad776f42a817ab217b3fd3496b.tar forums-f408ac052d5559ad776f42a817ab217b3fd3496b.tar.gz forums-f408ac052d5559ad776f42a817ab217b3fd3496b.tar.bz2 forums-f408ac052d5559ad776f42a817ab217b3fd3496b.tar.xz forums-f408ac052d5559ad776f42a817ab217b3fd3496b.zip | |
Added indicators for reported and/or unapproved items. Note that moderators with m_approve permission can now read unapproved topics and posts normally.
git-svn-id: file:///svn/phpbb/trunk@3640 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index b746b2f917..ddf47d078b 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -230,6 +230,9 @@ if ($forum_data['forum_postable']) 'FOLDER_ANNOUNCE_IMG' => $user->img('folder_announce', 'POST_ANNOUNCEMENT'), 'FOLDER_ANNOUNCE_NEW_IMG'=> $user->img('folder_announce_new', 'POST_ANNOUNCEMENT'), + 'REPORTED_IMG' => $user->img('item_reported', 'TOPIC_BEEN_REPORTED'), + 'UNAPPROVED_IMG' => $user->img('item_unapproved', 'TOPIC_NOT_BEEN_APPROVED'), + 'L_NO_TOPICS' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['POST_FORUM_LOCKED'] : $user->lang['NO_TOPICS'], 'S_IS_POSTABLE' => TRUE, @@ -284,7 +287,7 @@ if ($forum_data['forum_postable']) LEFT JOIN ' . LASTREAD_TABLE . ' lr ON lr.topic_id = t.topic_id AND lr.user_id = ' . $user->data['user_id'] . ") WHERE t.forum_id = $forum_id - AND t.topic_approved = 1 + " . (($auth->acl_gets('m_approve', 'a_', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " AND t.topic_type <> " . POST_ANNOUNCE . " $limit_topics_time ORDER BY t.topic_type DESC, $sort_order_sql @@ -488,6 +491,7 @@ if ($forum_data['forum_postable']) 'S_USER_POSTED' => ($row['lastread_type'] == LASTREAD_POSTED) ? true : false, 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_gets('m_', 'a_', $forum_id)) ? TRUE : FALSE, + 'S_TOPIC_UNAPPROVED' => (!$row['topic_approved'] && $auth->acl_gets('m_approve', 'a_', $forum_id)) ? TRUE : FALSE, 'U_VIEW_TOPIC' => $view_topic_url) ); |