From 0da1cfaa9b3a7b0b30503100308fd693b8982ed2 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Mon, 16 Jul 2001 20:07:20 +0000 Subject: [PATCH] Removed unrequired admin checks, modded moderator query, jiggled rank/avatar image stuff git-svn-id: file:///svn/phpbb/trunk@678 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/templates/PSO/viewtopic_body.tpl | 4 +-- phpBB/viewforum.php | 37 ++++++++++++++------------ phpBB/viewtopic.php | 10 +++---- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/phpBB/templates/PSO/viewtopic_body.tpl b/phpBB/templates/PSO/viewtopic_body.tpl index afc24ef919..cfce368b9a 100644 --- a/phpBB/templates/PSO/viewtopic_body.tpl +++ b/phpBB/templates/PSO/viewtopic_body.tpl @@ -12,7 +12,7 @@ - +
{TOPIC_TITLE}      
@@ -24,7 +24,7 @@ - + diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 9f9186b58b..6b117cd87c 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -106,7 +106,7 @@ if(!$is_auth['auth_read'] || !$is_auth['auth_view']) // // Do the forum Prune // -if( ( $is_auth['auth_mod'] || $is_auth['auth_admin'] ) && $board_config['prune_enable'] ) +if( $is_auth['auth_mod'] && $board_config['prune_enable'] ) { if( $forum_row['prune_next'] < time() && $forum_row['prune_enable'] ) { @@ -121,12 +121,13 @@ if( ( $is_auth['auth_mod'] || $is_auth['auth_admin'] ) && $board_config['prune_e // // Obtain list of moderators of this forum // -$sql = "SELECT g.group_name, g.group_id, g.group_single_user, ug.user_id - FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa - WHERE aa.forum_id = $forum_id +$sql = "SELECT g.group_name, g.group_id, g.group_single_user, u.user_id, u.username + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u + WHERE aa.forum_id = $forum_id AND aa.auth_mod = " . TRUE . " + AND ug.group_id = aa.group_id AND g.group_id = aa.group_id - AND ug.group_id = g.group_id"; + AND u.user_id = ug.user_id"; if(!$result_mods = $db->sql_query($sql)) { message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql); @@ -140,23 +141,25 @@ if( $total_mods = $db->sql_numrows($result_mods) ) for($i = 0; $i < $total_mods; $i++) { - if( !strstr($forum_moderators, $mods_rowset[$i]['group_name']) ) + if($mods_rowset[$i]['group_single_user']) + { + $mod_url = "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $mods_rowset[$i]['user_id']; + $mod_name = $mods_rowset[$i]['username']; + } + else + { + $mod_url = "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $mods_rowset[$i]['group_id']; + $mod_name = $mods_rowset[$i]['group_name']; + } + + if(!strstr($forum_moderators, $mod_name)) { if($i > 0) { $forum_moderators .= ", "; } - if($mods_rowset[$i]['group_single_user']) - { - $mod_url = "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $mods_rowset[$i]['user_id']; - } - else - { - $mod_url = "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $mods_rowset[$i]['group_id']; - } - - $forum_moderators .= "" . $mods_rowset[$i]['group_name'] .""; + $forum_moderators .= "$mod_name"; } } } @@ -258,7 +261,7 @@ $s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_reply']) ? $lang['can'] : $s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_edit']) ? $lang['can'] : $lang['cannot'] ) . " " . $lang['edit_posts'] . "
"; $s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_delete']) ? $lang['can'] : $lang['cannot'] ) . " " . $lang['delete_posts'] . "
"; -if($is_auth['auth_mod'] || $userdata['user_level'] == ADMIN) +if( $is_auth['auth_mod'] ) { $s_auth_can .= $lang['You'] . " " . $lang['can'] . " " . $lang['moderate_forum'] . "
"; } diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index ee1b0acaff..3752b2d218 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -284,7 +284,7 @@ for($i = 0; $i < $total_posts; $i++) if($postrow[$i]['user_avatar'] != "" && $poster_id != ANONYMOUS) { - $poster_avatar = (strstr("http", $postrow[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "" : ""; + $poster_avatar = (strstr("http", $postrow[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "

" : "

"; } else { @@ -306,7 +306,7 @@ for($i = 0; $i < $total_posts; $i++) if($postrow[$i]['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special']) { $poster_rank = $ranksrow[$j]['rank_title']; - $rank_image = ($ranksrow[$j]['rank_image']) ? "" : ""; + $rank_image = ($ranksrow[$j]['rank_image']) ? "
" : ""; } } } @@ -317,7 +317,7 @@ for($i = 0; $i < $total_posts; $i++) if($postrow[$i]['user_posts'] > $ranksrow[$j]['rank_min'] && $postrow[$i]['user_posts'] < $ranksrow[$j]['rank_max'] && !$ranksrow[$j]['rank_special']) { $poster_rank = $ranksrow[$j]['rank_title']; - $rank_image = ($ranksrow[$j]['rank_image']) ? "" : ""; + $rank_image = ($ranksrow[$j]['rank_image']) ? "
" : ""; } } } @@ -378,7 +378,7 @@ for($i = 0; $i < $total_posts; $i++) $quote_img = "\"""; - if($is_auth['auth_mod'] || $userdata['user_level'] == ADMIN) + if( $is_auth['auth_mod'] ) { $ip_img = "\"""; @@ -483,7 +483,7 @@ $s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_reply']) ? $lang['can'] : $s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_edit']) ? $lang['can'] : $lang['cannot'] ) . " " . $lang['edit_posts'] . "
"; $s_auth_can .= $lang['You'] . " " . ( ($is_auth['auth_delete']) ? $lang['can'] : $lang['cannot'] ) . " " . $lang['delete_posts'] . "
"; -if($is_auth['auth_mod'] || $userdata['user_level'] == ADMIN) +if( $is_auth['auth_mod'] ) { $s_auth_can .= $lang['You'] . " " . $lang['can'] . " " . $lang['moderate_forum'] . "
";
{postrow.POSTER_NAME}
{postrow.POSTER_RANK}
{postrow.RANK_IMAGE}

{postrow.POSTER_AVATAR}

{postrow.POSTER_JOINED}
{postrow.POSTER_POSTS}
{postrow.POSTER_FROM}

{postrow.POSTER_NAME}
{postrow.POSTER_RANK}
{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}

{postrow.POSTER_JOINED}
{postrow.POSTER_POSTS}
{postrow.POSTER_FROM}
Back to top