diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 254cd88625..e28daa9aef 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -718,7 +718,8 @@ function show_profile($data) { if ((empty($rank['rank_special']) && empty($data['user_rank']) && $data['user_posts'] >= $rank['rank_min']) || (!empty($rank['rank_special']) && $data['user_rank'] == $rank['rank_id'])) { - $rank_img = (!empty($rank['rank_image'])) ? '' . $rank['rank_title'] . '
' : ''; + $rank_title = (!empty($rank['rank_title'])) ? $rank['rank_title'] : ''; + $rank_img = (!empty($rank['rank_image'])) ? '' .$rank_title . '
' : ''; break; } } @@ -785,28 +786,29 @@ function show_profile($data) 'ONLINE_IMG' => (intval($data['session_time']) >= time() - ($config['load_online_time'] * 60)) ? $user->img('btn_online', $user->lang['USER_ONLINE']) : $user->img('btn_offline', $user->lang['USER_ONLINE']), 'RANK_IMG' => $rank_img, + 'PM_IMG' => $pm_img, + 'EMAIL_IMG' => $email_img, + 'WWW_IMG' => $www_img, + 'ICQ_STATUS_IMG'=> $icq_status_img, + 'ICQ_IMG' => $icq_img, + 'AIM_IMG' => $aim_img, + 'MSN_IMG' => $msn_img, + 'YIM_IMG' => $yim_img, '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, - 'PM_IMG' => $pm_img, - 'PM' => $pm, - 'EMAIL_IMG' => $email_img, - 'EMAIL' => $email, - 'WWW_IMG' => $www_img, - 'WWW' => $www, - 'ICQ_STATUS_IMG'=> $icq_status_img, - 'ICQ_IMG' => $icq_img, - 'ICQ' => $icq, - 'AIM_IMG' => $aim_img, - 'AIM' => $aim, - 'MSN_IMG' => $msn_img, - 'MSN' => $msn, - 'YIM_IMG' => $yim_img, - 'YIM' => $yim, + 'RANK' => $rank_title, + 'PM' => $pm, + 'EMAIL' => $email, + 'WWW' => $www, + 'ICQ' => $icq, + 'AIM' => $aim, + 'MSN' => $msn, + 'YIM' => $yim, - 'S_ONLINE' => (intval($data['session_time']) >= time() - 300) ? true : false + 'S_ONLINE' => (intval($data['session_time']) >= time() - 300) ? true : false ); return $template_vars; diff --git a/phpBB/templates/subSilver/memberlist_view.html b/phpBB/templates/subSilver/memberlist_view.html index 03f540b4bd..c98041845f 100644 --- a/phpBB/templates/subSilver/memberlist_view.html +++ b/phpBB/templates/subSilver/memberlist_view.html @@ -19,12 +19,21 @@ {USERNAME} + + + {RANK} + + + {RANK_IMG} + + {AVATAR_IMG} + {ONLINE_IMG} diff --git a/phpBB/templates/subSilver/viewforum_body.html b/phpBB/templates/subSilver/viewforum_body.html index 9326561eea..4536399f64 100644 --- a/phpBB/templates/subSilver/viewforum_body.html +++ b/phpBB/templates/subSilver/viewforum_body.html @@ -35,7 +35,7 @@ - +
 {S_WATCH_FORUM} {S_WATCH_FORUM} {L_MARK_TOPICS_READ} 
diff --git a/phpBB/templates/subSilver/viewtopic_body.html b/phpBB/templates/subSilver/viewtopic_body.html index 4910515f50..5632c4c658 100644 --- a/phpBB/templates/subSilver/viewtopic_body.html +++ b/phpBB/templates/subSilver/viewtopic_body.html @@ -85,18 +85,48 @@ {L_AUTHOR} {L_MESSAGE} + + - - {postrow.L_IGNORE_POST} - - {postrow.L_IGNORE_POST} + + + {postrow.L_IGNORE_POST} - {postrow.POSTER_NAME}
{postrow.POSTER_RANK}
{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}

{L_JOINED}: {postrow.POSTER_JOINED}
{L_POSTS}: {postrow.POSTER_POSTS}
{L_LOCATION}: {postrow.POSTER_FROM} + + + + + + + + + + + + + + + + + + + + + +
{postrow.POSTER_NAME}
{postrow.POSTER_RANK}
{postrow.RANK_IMAGE}
{postrow.POSTER_AVATAR}
+ + +
{L_JOINED}: {postrow.POSTER_JOINED} +
{L_POSTS}: {postrow.POSTER_POSTS} +
{L_LOCATION}: {postrow.POSTER_FROM} + + + @@ -106,16 +136,21 @@
{postrow.POST_ICON_IMG} 
+ + @@ -143,11 +178,13 @@
- +
{postrow.MESSAGE}
_________________
{postrow.SIGNATURE}{postrow.EDITED_MESSAGE}		{postrow.MESSAGE} + +
_________________
{postrow.SIGNATURE} + {postrow.EDITED_MESSAGE}
+ + {L_BACK_TO_TOP} @@ -166,7 +203,9 @@ + + diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 12b72b5bae..cd3b6ee532 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -187,8 +187,12 @@ if ($forum_data['forum_type'] == FORUM_POST) // Forum rules, subscription info and word censors $s_watching_forum = $s_watching_forum_img = ''; - $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; - watch_topic_forum('forum', $s_watching_forum, $s_watching_forum_img, $user->data['user_id'], $forum_id, $notify_status); + + if ($config['email_enable'] && $config['allow_forum_notify']) + { + $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; + watch_topic_forum('forum', $s_watching_forum, $s_watching_forum_img, $user->data['user_id'], $forum_id, $notify_status); + } $s_forum_rules = ''; gen_forum_rules('forum', $forum_id); @@ -549,7 +553,7 @@ if ($forum_data['forum_type'] == FORUM_POST) // after reading a topic if ($user->data['user_id'] != ANONYMOUS && $update_forum) { - markread('mark', $forum_id, false, time()); + markread('mark', $forum_id); } } diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 326ccca9d6..f9b25b6e8c 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -250,7 +250,7 @@ if ($topic_attachment) // Are we watching this topic? $s_watching_topic = $s_watching_topic_img = ''; -if ($config['email_enable']) +if ($config['email_enable'] && $config['allow_topic_notify']) { watch_topic_forum('topic', $s_watching_topic, $s_watching_topic_img, $user->data['user_id'], $topic_id, $notify_status); } @@ -617,7 +617,7 @@ $force_encoding = ''; $bbcode_bitfield = $i = 0; // Go ahead and pull all data for this topic -$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_karma, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_jabber, u.user_regdate, u.user_msnm, u.user_allow_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_sig_bbcode_bitfield, u.user_avatar, u.user_avatar_type, u.user_avatar_width, u.user_avatar_height, p.* +$sql = "SELECT u.username, u.user_id, u.user_colour, u.user_posts, u.user_from, u.user_karma, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_jabber, u.user_regdate, u.user_msnm, u.user_allow_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_sig_bbcode_bitfield, u.user_avatar, u.user_avatar_type, u.user_avatar_width, u.user_avatar_height, p.* FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u WHERE p.topic_id = $topic_id " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1') . " @@ -652,7 +652,7 @@ do $rowset[] = array( 'post_id' => $row['post_id'], 'post_time' => $row['post_time'], - 'poster' => $poster, + 'poster' => ($row['user_colour']) ? '' . $poster . '' : $poster, 'user_id' => $row['user_id'], 'topic_id' => $row['topic_id'], 'forum_id' => $row['forum_id'], @@ -893,8 +893,8 @@ foreach ($rowset as $key => $row) if (!empty($row['below_karma'])) { $template->assign_block_vars('postrow', array( - 'S_BELOW_MIN_KARMA' => true, - 'S_ROW_COUNT' => $i++, + 'S_IGNORE_POST' => true, + 'S_ROW_COUNT' => $i++, 'L_IGNORE_POST' => sprintf($user->lang['POST_BELOW_KARMA'], $row['poster'], intval($row['user_karma']), '', '')) ); @@ -910,10 +910,10 @@ foreach ($rowset as $key => $row) else { $template->assign_block_vars('postrow', array( - 'S_WRONG_ENCODING' => true, - 'S_ROW_COUNT' => $i++, + 'S_IGNORE_POST' => true, + 'S_ROW_COUNT' => $i++, - 'L_IGNORE_POST' => sprintf($user->lang['POST_ENCODING'], $row['poster'], '', '')) + 'L_IGNORE_POST' => sprintf($user->lang['POST_ENCODING'], $row['poster'], '', '')) ); continue;
{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}