- | {S_AUTH_LIST} |
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index 61358f18a..f4bc7248e 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -619,25 +619,19 @@ function build_poll_add_form (src_el)
- {S_WATCH_TOPIC}
-
-
-
- {S_TOPIC_ADMIN}
-
-
-
- Admin:
- {L_LOGS}
+
+
+
+
+ {L_MANAGE}: {S_TOPIC_ADMIN}
+
+
+ {S_WATCH_TOPIC}
+
+
+
+
- {S_DL_DELETE}
-
-
- {S_AUTH_LIST}
-
|
|
\ No newline at end of file
diff --git a/viewforum.php b/viewforum.php
index 3cbee8594..39fc24677 100644
--- a/viewforum.php
+++ b/viewforum.php
@@ -408,18 +408,6 @@ $template->assign_vars(array(
'S_DISPLAY_ORDER' => $s_display_order,
));
-// User authorisation levels output
-$u_auth = array();
-$u_auth[] = ($is_auth['auth_post']) ? $lang['RULES_POST_CAN'] : $lang['RULES_POST_CANNOT'];
-$u_auth[] = ($is_auth['auth_reply']) ? $lang['RULES_REPLY_CAN'] : $lang['RULES_REPLY_CANNOT'];
-$u_auth[] = ($is_auth['auth_edit']) ? $lang['RULES_EDIT_CAN'] : $lang['RULES_EDIT_CANNOT'];
-$u_auth[] = ($is_auth['auth_delete']) ? $lang['RULES_DELETE_CAN'] : $lang['RULES_DELETE_CANNOT'];
-$u_auth[] = ($is_auth['auth_vote']) ? $lang['RULES_VOTE_CAN'] : $lang['RULES_VOTE_CANNOT'];
-$u_auth[] = ($is_auth['auth_attachments']) ? $lang['RULES_ATTACH_CAN'] : $lang['RULES_ATTACH_CANNOT'];
-$u_auth[] = ($is_auth['auth_download']) ? $lang['RULES_DOWNLOAD_CAN'] : $lang['RULES_DOWNLOAD_CANNOT'];
-$u_auth[] = ($is_auth['auth_mod']) ? $lang['RULES_MODERATE'] : '';
-$u_auth = join("
\n", $u_auth);
-
$template->assign_vars(array(
'SHOW_JUMPBOX' => true,
'PAGE_TITLE' => htmlCHR($forum_data['forum_name']),
@@ -442,7 +430,6 @@ $template->assign_vars(array(
'TITLE_MATCH' => htmlCHR($title_match),
'SELECT_TPP' => ($select_tpp) ? build_select('tpp', $select_tpp, $topics_per_page, null, null, 'onchange="$(\'#tpp\').submit();"') : '',
'T_POST_NEW_TOPIC' => ($forum_data['forum_status'] == FORUM_LOCKED) ? $lang['FORUM_LOCKED'] : $post_new_topic,
- 'S_AUTH_LIST' => $u_auth,
'U_VIEW_FORUM' => FORUM_URL . $forum_id,
'U_MARK_READ' => FORUM_URL . $forum_id ."&mark=topics",
'U_SEARCH_SELF' => "search.php?uid={$userdata['user_id']}&f=$forum_id",
diff --git a/viewtopic.php b/viewtopic.php
index 52b8cb168..52b133746 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -242,9 +242,7 @@ if ($post_id && !empty($t_data['prev_posts']))
$start = floor(($t_data['prev_posts'] - 1) / $posts_per_page) * $posts_per_page;
}
-//
// Is user watching this thread?
-//
$can_watch_topic = $is_watching_topic = false;
if ($bb_cfg['topic_notify_enabled'])
@@ -252,7 +250,6 @@ if ($bb_cfg['topic_notify_enabled'])
if ($userdata['session_logged_in'])
{
$can_watch_topic = TRUE;
-
if (!empty($t_data['notify_status']) && $t_data['notify_status'])
{
if (isset($_GET['unwatch']))
@@ -260,18 +257,14 @@ if ($bb_cfg['topic_notify_enabled'])
if ($_GET['unwatch'] == 'topic')
{
$is_watching_topic = 0;
-
DB()->query("DELETE FROM ". BB_TOPICS_WATCH ." WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
}
-
set_die_append_msg($forum_id, $topic_id);
bb_die($lang['NO_LONGER_WATCHING']);
-
}
else
{
$is_watching_topic = TRUE;
-
if (!$t_data['notify_status'])
{
DB()->query("UPDATE ". BB_TOPICS_WATCH ." SET notify_status = ". TOPIC_WATCH_NOTIFIED ." WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
@@ -285,16 +278,13 @@ if ($bb_cfg['topic_notify_enabled'])
if ($_GET['watch'] == 'topic')
{
$is_watching_topic = TRUE;
-
DB()->query("
INSERT INTO ". BB_TOPICS_WATCH ." (user_id, topic_id, notify_status)
VALUES (". $userdata['user_id'] .", $topic_id, ". TOPIC_WATCH_NOTIFIED .")
");
}
-
set_die_append_msg($forum_id, $topic_id);
bb_die($lang['YOU_ARE_WATCHING']);
-
}
else
{
@@ -441,59 +431,34 @@ $reply_alt = ( $t_data['forum_status'] == FORUM_LOCKED || $t_data['topic_status'
// Set 'body' template for attach_mod
$template->set_filenames(array('body' => 'viewtopic.tpl'));
-//
-// User authorisation levels output
-//
-$s_auth_can = (($is_auth['auth_post']) ? $lang['RULES_POST_CAN'] : $lang['RULES_POST_CANNOT']) . '
';
-$s_auth_can .= (($is_auth['auth_reply']) ? $lang['RULES_REPLY_CAN'] : $lang['RULES_REPLY_CANNOT']) . '
';
-$s_auth_can .= (($is_auth['auth_edit']) ? $lang['RULES_EDIT_CAN'] : $lang['RULES_EDIT_CANNOT']) . '
';
-$s_auth_can .= (($is_auth['auth_delete']) ? $lang['RULES_DELETE_CAN'] : $lang['RULES_DELETE_CANNOT']) . '
';
-$s_auth_can .= (($is_auth['auth_vote']) ? $lang['RULES_VOTE_CAN'] : $lang['RULES_VOTE_CANNOT']) . '
';
-$s_auth_can .= (($is_auth['auth_attachments']) ? $lang['RULES_ATTACH_CAN'] : $lang['RULES_ATTACH_CANNOT']) . '
';
-$s_auth_can .= (($is_auth['auth_download']) ? $lang['RULES_DOWNLOAD_CAN'] : $lang['RULES_DOWNLOAD_CANNOT']) . '
';
-
+// Moderator output
$topic_mod = '';
-
if ($is_auth['auth_mod'])
{
- $s_auth_can .= $lang['RULES_MODERATE'];
- $topic_mod .= "![' . $lang['DELETE_TOPIC'] . '](' . $images['topic_mod_delete'] . ' "' . $lang['DELETE_TOPIC'] . '") ';
- $topic_mod .= "![' . $lang['MOVE_TOPIC'] . '](' . $images['topic_mod_move'] . ' "' . $lang['MOVE_TOPIC'] . '") ';
- $topic_mod .= ( $t_data['topic_status'] == TOPIC_UNLOCKED ) ? "![' . $lang['LOCK_TOPIC'] . '](' . $images['topic_mod_lock'] . ' "' . $lang['LOCK_TOPIC'] . '") ' : "![' . $lang['UNLOCK_TOPIC'] . '](' . $images['topic_mod_unlock'] . ' "' . $lang['UNLOCK_TOPIC'] . '") ';
- $topic_mod .= "![' . $lang['SPLIT_TOPIC'] . '](' . $images['topic_mod_split'] . ' "' . $lang['SPLIT_TOPIC'] . '") ';
-
- if ($t_data['allow_reg_tracker'] || $t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL || IS_ADMIN)
- {
- if ($t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL)
- {
- $topic_mod .= "![' . $lang['UNSET_DL_STATUS'] . '](' . $images['topic_normal'] . ' "' . $lang['UNSET_DL_STATUS'] . '") ';
- }
- else
- {
- $topic_mod .= "![' . $lang['SET_DL_STATUS'] . '](' . $images['topic_dl'] . ' "' . $lang['SET_DL_STATUS'] . '") ';
- }
- }
+ $locked = ($t_data['topic_status'] == TOPIC_LOCKED);
+ $topic_mod .= " ";
+ $topic_mod .= " " : " ";
+ $topic_mod .= " ";
}
elseif (($t_data['topic_poster'] == $userdata['user_id']) && $userdata['session_logged_in'] && $t_data['self_moderated'])
{
- $topic_mod .= " ';
+ $topic_mod .= " ";
}
-//
// Topic watch information
-//
$s_watching_topic = $s_watching_topic_img = '';
if ($can_watch_topic)
{
if ($is_watching_topic)
{
- $s_watching_topic = "' . $lang['STOP_WATCHING_TOPIC'] . '';
- $s_watching_topic_img = (isset($images['topic_un_watch'])) ? "![' . $lang['STOP_WATCHING_TOPIC'] . '](' . $images['topic_un_watch'] . ' "' . $lang['STOP_WATCHING_TOPIC'] . '") ' : '';
+ $s_watching_topic = "{$lang['STOP_WATCHING_TOPIC']}";
+ $s_watching_topic_img = (isset($images['topic_un_watch'])) ? "" : '';
}
else
{
- $s_watching_topic = "' . $lang['START_WATCHING_TOPIC'] . '';
- $s_watching_topic_img = (isset($images['Topic_watch'])) ? "![' . $lang['START_WATCHING_TOPIC'] . '](' . $images['Topic_watch'] . ' "' . $lang['START_WATCHING_TOPIC'] . '") ' : '';
+ $s_watching_topic = "{$lang['START_WATCHING_TOPIC']}";
+ $s_watching_topic_img = (isset($images['topic_watch'])) ? "" : '';
}
}
@@ -507,9 +472,7 @@ $pg_url .= ($posts_per_page != $bb_cfg['posts_per_page']) ? "&ppp=$posts_per
generate_pagination($pg_url, $total_replies, $posts_per_page, $start);
-//
// Selects
-//
$sel_previous_days = array(
0 => $lang['ALL_POSTS'],
1 => $lang['1_DAY'],
@@ -571,7 +534,6 @@ $template->assign_vars(array(
'S_SELECT_POST_DAYS' => build_select('postdays', array_flip($sel_previous_days), $post_days),
'S_SELECT_POST_ORDER' => build_select('postorder', $sel_post_order_ary, $post_order),
'S_POST_DAYS_ACTION' => TOPIC_URL . $topic_id . "&start=$start",
- 'S_AUTH_LIST' => $s_auth_can,
'S_TOPIC_ADMIN' => $topic_mod,
'S_WATCH_TOPIC' => $s_watching_topic,
'S_WATCH_TOPIC_IMG' => $s_watching_topic_img,
@@ -883,7 +845,7 @@ $template->assign_vars(array(
if (IS_ADMIN)
{
$template->assign_vars(array(
- 'U_LOGS' => "admin/admin_log.php?sid={$userdata['session_id']}&t=$topic_id&db=900",
+ 'U_LOGS' => "admin/admin_log.php?t=$topic_id&db=365",
));
}
|