diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-26 23:53:34 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-26 23:53:34 +0000 |
| commit | e1484f522d28194c63d424bc621b93d3cf8865b9 (patch) | |
| tree | a6c2e5b249ac9c688525f24737fc8e29d1c669e1 /phpBB/viewtopic.php | |
| parent | 4e71b1b96d21e78463a768004c1c8ed2e1d952d5 (diff) | |
| download | forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar.gz forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar.bz2 forums-e1484f522d28194c63d424bc621b93d3cf8865b9.tar.xz forums-e1484f522d28194c63d424bc621b93d3cf8865b9.zip | |
Majority are UCP related updates ... avatars should now work, aside from gallery, fixed a few other issues, updated schema/basic
git-svn-id: file:///svn/phpbb/trunk@4062 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 23339deb7d..a767416e5d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -380,7 +380,7 @@ $topic_mod .= ($auth->acl_get('f_announce', $forum_id) && ($topic_type != POST_A $topic_mod .= ($auth->acl_get('m_', $forum_id)) ? '<option value="viewlogs">' . $user->lang['VIEW_TOPIC_LOGS'] . '</option>' : ''; // If we've got a hightlight set pass it on to pagination. -$pagination_url = "viewtopic.$phpEx$SID&t=$topic_id&" . (($highlight_match) ? "&hilit=$highlight" : ''); +$pagination_url = "viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id&" . (($highlight_match) ? "&hilit=$highlight" : ''); $pagination = generate_pagination($pagination_url, $total_posts, $config['posts_per_page'], $start); @@ -758,22 +758,20 @@ do ); - if ($row['user_avatar_type'] && $user->data['user_viewavatars']) + if ($row['user_avatar'] && $user->data['user_viewavatars']) { switch ($row['user_avatar_type']) { - case USER_AVATAR_UPLOAD: - $user_cache[$poster_id]['avatar'] = ($config['allow_avatar_upload']) ? '<img src="' . $config['avatar_path'] . '/' . $row['user_avatar'] . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />' : ''; + case AVATAR_UPLOAD: + $avatar_img = $config['avatar_path'] . '/'; break; - - case USER_AVATAR_REMOTE: - $user_cache[$poster_id]['avatar'] = ($config['allow_avatar_remote']) ? '<img src="' . $row['user_avatar'] . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />' : ''; - break; - - case USER_AVATAR_GALLERY: - $user_cache[$poster_id]['avatar'] = ($config['allow_avatar_local']) ? '<img src="' . $config['avatar_gallery_path'] . '/' . $row['user_avatar'] . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />' : ''; + case AVATAR_GALLERY: + $avatar_img = $config['avatar_gallery_path'] . '/'; break; } + $avatar_img .= $row['user_avatar']; + + $user_cache[$poster_id]['avatar'] = '<img src="' . $avatar_img . '" width="' . $user->data['user_avatar_width'] . '" height="' . $user->data['user_avatar_height'] . '" border="0" alt="" />'; } if (!empty($row['user_rank'])) @@ -892,7 +890,7 @@ if ($bbcode_bitfield) foreach ($rowset as $key => $row) { - $poster_id = intval($row['user_id']); + $poster_id = $row['user_id']; // Three situations can prevent a post being display: // i) The posters karma is below the minimum of the user @@ -1024,14 +1022,14 @@ foreach ($rowset as $key => $row) 'RATING' => $rating, - 'MINI_POST_IMG' => ($row['post_time'] > $user->data['user_lastvisit'] && $row['post_time'] > $topic_last_read) ? $user->img('icon_post_new', $user->lang['NEW_POST']) : $user->img('icon_post', $user->lang['POST']), + 'MINI_POST_IMG' => ($row['post_time'] > $user->data['user_lastvisit'] && $row['post_time'] > $topic_last_read && $user->data['user_id'] != ANONYMOUS) ? $user->img('icon_post_new', $user->lang['NEW_POST']) : $user->img('icon_post', $user->lang['POST']), 'POST_ICON_IMG' => (!empty($row['icon_id'])) ? '<img src="' . $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] . '" width="' . $icons[$row['icon_id']]['width'] . '" height="' . $icons[$row['icon_id']]['height'] . '" alt="" title="" />' : '', 'ICQ_STATUS_IMG' => $user_cache[$poster_id]['icq_status_img'], - 'U_EDIT' => (($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) && ($post_time > time() - $config['edit_time'] || !$config['edit_time'])) || $auth->acl_get('m_edit', $forum_id)) ? "posting.$phpEx$SID&mode=edit&f=" . $row['forum_id'] . "&p=" . $row['post_id'] : '', + 'U_EDIT' => (($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) && ($row['post_time'] > time() - $config['edit_time'] || !$config['edit_time'])) || $auth->acl_get('m_edit', $forum_id)) ? "posting.$phpEx$SID&mode=edit&f=" . $row['forum_id'] . "&p=" . $row['post_id'] : '', 'U_QUOTE' => ($auth->acl_get('f_quote', $forum_id)) ? "posting.$phpEx$SID&mode=quote&p=" . $row['post_id'] : '', 'U_IP' => ($auth->acl_get('m_ip', $forum_id)) ? "mcp.$phpEx?sid=" . $user->session_id . "&mode=post_details&p=" . $row['post_id'] . "&t=$topic_id#ip" : '', - 'U_DELETE' => (($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id']) || $auth->acl_get('m_delete', $forum_id)) ? "posting.$phpEx$SID&mode=delete&p=" . $row['post_id'] : '', + 'U_DELETE' => (($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && ($row['post_time'] > time() - $config['edit_time'] || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id)) ? "posting.$phpEx$SID&mode=delete&p=" . $row['post_id'] : '', 'U_PROFILE' => $user_cache[$poster_id]['profile'], 'U_SEARCH' => $user_cache[$poster_id]['search'], @@ -1056,7 +1054,6 @@ foreach ($rowset as $key => $row) 'S_POST_REPORTED' => ($row['post_reported'] && $auth->acl_get('m_', $forum_id)) ? TRUE : FALSE) ); - // Process Attachments for this post if (sizeof($attachments[$row['post_id']])) { @@ -1293,8 +1290,6 @@ if ($force_encoding != '') // Output the page page_header($user->lang['VIEW_TOPIC'] .' - ' . $topic_title); -//print_r($_COOKIE); - $template->set_filenames(array( 'body' => (isset($_GET['view']) && $_GET['view'] == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html') ); |