aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-10-11 22:05:36 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-10-11 22:05:36 +0000
commitdd2033ace0ccbb711406114777dc97a34c996bdc (patch)
treed2fe2aeaa57c15e78d037af5966dbd605cec1040 /phpBB/viewtopic.php
parente2c755710fa55e69af45827c87547c687fefc1a4 (diff)
downloadforums-dd2033ace0ccbb711406114777dc97a34c996bdc.tar
forums-dd2033ace0ccbb711406114777dc97a34c996bdc.tar.gz
forums-dd2033ace0ccbb711406114777dc97a34c996bdc.tar.bz2
forums-dd2033ace0ccbb711406114777dc97a34c996bdc.tar.xz
forums-dd2033ace0ccbb711406114777dc97a34c996bdc.zip
Preliminary avatar gallery support
git-svn-id: file:///svn/phpbb/trunk@1173 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php17
1 files changed, 14 insertions, 3 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 7fd23c2f95..c216289a76 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -381,7 +381,7 @@ $select_post_order .= "</select>";
//
// Go ahead and pull all data for this topic
//
-$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, p.*, pt.post_text, pt.post_subject
+$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, p.*, pt.post_text, pt.post_subject
FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
WHERE p.topic_id = $topic_id
AND p.poster_id = u.user_id
@@ -665,9 +665,20 @@ for($i = 0; $i < $total_posts; $i++)
$poster_joined = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($board_config['default_dateformat'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : "";
- if($postrow[$i]['user_avatar'] != "" && $poster_id != ANONYMOUS)
+ if( $postrow[$i]['user_avatar_type'] && $poster_id != ANONYMOUS )
{
- $poster_avatar = (eregi("http", $postrow[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "<br /><img src=\"" . $postrow[$i]['user_avatar'] . "\"><br />" : "<br /><img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" /><br />";
+ switch( $postrow[$i]['user_avatar_type'] )
+ {
+ case USER_AVATAR_UPLOAD:
+ $poster_avatar = "<img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" />";
+ break;
+ case USER_AVATAR_REMOTE:
+ $poster_avatar = "<img src=\"" . $postrow[$i]['user_avatar'] . "\" alt=\"\" />";
+ break;
+ case USER_AVATAR_GALLERY:
+ $poster_avatar = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" />";
+ break;
+ }
}
else
{