diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2005-12-17 20:41:23 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2005-12-17 20:41:23 +0000 |
| commit | e7565d31d0c25a330f5310bed765d9470096c21d (patch) | |
| tree | e8a81bcbc9b4e13436e34377c2f72b41a8b1cc85 /phpBB | |
| parent | 791b1bbe73215cb98ed79fa78353182b9b0803a7 (diff) | |
| download | forums-e7565d31d0c25a330f5310bed765d9470096c21d.tar forums-e7565d31d0c25a330f5310bed765d9470096c21d.tar.gz forums-e7565d31d0c25a330f5310bed765d9470096c21d.tar.bz2 forums-e7565d31d0c25a330f5310bed765d9470096c21d.tar.xz forums-e7565d31d0c25a330f5310bed765d9470096c21d.zip | |
Expose the warning level and user notes in appropriate places (assuming
the user has the correct permissions)
git-svn-id: file:///svn/phpbb/trunk@5345 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 1 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 5 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/memberlist_view.html | 10 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 3 |
4 files changed, 16 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 30bf123078..a1f9105e13 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -229,6 +229,7 @@ class ucp_main 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', 'JOINED' => $user->format_date($user->data['user_regdate'], $user->lang['DATE_FORMAT']), 'VISITED' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit, $user->lang['DATE_FORMAT']), + 'WARNINGS' => ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0, 'POSTS' => ($user->data['user_posts']) ? $user->data['user_posts'] : 0, 'POSTS_DAY' => sprintf($user->lang['POST_DAY'], $posts_per_day), 'POSTS_PCT' => sprintf($user->lang['POST_PCT'], $percentage), diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 1fb2ca6a04..70028846ce 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -295,7 +295,7 @@ switch ($mode) } // - $sql = 'SELECT username, user_id, user_type, user_colour, user_permissions, user_sig, user_sig_bbcode_uid, user_sig_bbcode_bitfield, user_allow_viewemail, user_allow_viewonline, user_posts, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_avatar, user_avatar_width, user_avatar_height, user_avatar_type, user_lastvisit + $sql = 'SELECT username, user_id, user_type, user_colour, user_permissions, user_sig, user_sig_bbcode_uid, user_sig_bbcode_bitfield, user_allow_viewemail, user_allow_viewonline, user_posts, user_warnings, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_avatar, user_avatar_width, user_avatar_height, user_avatar_type, user_lastvisit FROM ' . USERS_TABLE . " WHERE user_id = $user_id AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')'; @@ -1215,6 +1215,7 @@ function show_profile($data) 'JOINED' => $user->format_date($data['user_regdate'], $user->lang['DATE_FORMAT']), 'VISITED' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit, $user->lang['DATE_FORMAT']), 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, + 'WARNINGS' => ($data['user_warnings']) ? $data['user_warnings'] : 0, 'ONLINE_IMG' => ($poster_id == ANONYMOUS) ? '' : (($online) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE')), 'RANK_IMG' => $rank_img, @@ -1222,6 +1223,8 @@ function show_profile($data) 'U_PROFILE' => "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u=$user_id", 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? "{$phpbb_root_path}search.$phpEx$SID&search_author=" . urlencode($username) . "&show_results=posts" : '', + 'U_NOTES' => $auth->acl_gets('m_', 'a_') ? "{$phpbb_root_path}mcp.$phpEx$SID&i=notes&mode=user_notes&u=$user_id" : '', + 'U_WARN' => $auth->acl_gets('m_', 'a_') ? "{$phpbb_root_path}mcp.$phpEx$SID&i=warn&mode=warn_user&u=$user_id" : '', 'U_PM' => ($auth->acl_get('u_sendpm')) ? "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=compose&u=$user_id" : '', 'U_EMAIL' => $email, 'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '', diff --git a/phpBB/styles/subSilver/template/memberlist_view.html b/phpBB/styles/subSilver/template/memberlist_view.html index e95b662e46..6bf1f427e8 100644 --- a/phpBB/styles/subSilver/template/memberlist_view.html +++ b/phpBB/styles/subSilver/template/memberlist_view.html @@ -48,11 +48,17 @@ </tr> <tr> <td class="gen" align="right" nowrap="nowrap">{L_VISITED}: </td> - <td width="100%"><b class="gen">{VISITED}</td> + <td width="100%"><b class="gen">{VISITED}</b></td> </tr> + <!-- IF U_NOTES --> + <tr> + <td class="gen" align="right" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> + <td width="100%"><b class="gen">{WARNINGS}</b><br /><span class="genmed">[ <a href="{U_NOTES}">{L_VIEW_NOTES}</a> | <a href="{U_WARN}">{L_WARN_USER}</a> ]</td> + </tr> + <!-- ENDIF --> <tr> <td class="gen" align="right" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> - <td><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td> + <td><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}</b><!-- ENDIF --></td> </tr> <tr> <td class="gen" align="right" valign="top" nowrap="nowrap">{L_ACTIVE_IN_FORUM}: </td> diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 916ca17249..689e1c37f0 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -886,6 +886,7 @@ while ($row = $db->sql_fetchrow($result)) $user_cache[$poster_id] = array( 'joined' => $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']), 'posts' => $row['user_posts'], + 'warnings' => $row['user_warnings'], 'from' => (!empty($row['user_from'])) ? $row['user_from'] : '', 'sig' => $user_sig, @@ -1262,6 +1263,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'POSTER_POSTS' => $user_cache[$poster_id]['posts'], 'POSTER_FROM' => $user_cache[$poster_id]['from'], 'POSTER_AVATAR' => $user_cache[$poster_id]['avatar'], + 'POSTER_WARNINGS' => $user_cache[$poster_id]['warnings'], 'POST_DATE' => $user->format_date($row['post_time']), 'POST_SUBJECT' => $row['post_subject'], @@ -1300,6 +1302,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'U_MINI_POST' => "{$phpbb_root_path}viewtopic.$phpEx$SID&p=" . $row['post_id'] . '#' . $row['post_id'], 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$i + 1])) ? $rowset[$i + 1]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, + 'U_NOTES' => ($auth->acl_gets('m_', 'a_')) ? "{$phpbb_root_path}mcp.$phpEx$SID&i=notes&mode=user_notes&u=" . $poster_id : '', 'U_WARN' => ($auth->acl_gets('m_', 'a_', $forum_id)) ? "{$phpbb_root_path}mcp.$phpEx$SID&i=warn&mode=warn_post&p=" . $row['post_id'] : '', 'POST_ID' => $row['post_id'], |