12 vuotta sitten · 410e45dd17
--- a/Sources/MessageIndex.php
+++ b/Sources/MessageIndex.php
@@ -361,13 +361,14 @@ function MessageIndex()
 
 				' . ($user_info['is_guest'] ? '0' : 'IFNULL(lt.id_msg, IFNULL(lmr.id_msg, -1)) + 1') . ' AS new_from,
 
 				t.id_last_msg, t.approved, t.unapproved_posts, t.id_redirect_topic, ml.poster_time AS last_poster_time,
 
 				ml.id_msg_modified, ml.subject AS last_subject, ml.icon AS last_icon,
 
-				ml.poster_name AS last_member_name, ml.id_member AS last_id_member,
 
+				ml.poster_name AS last_member_name, ml.id_member AS last_id_member, meml.avatar,
 
 				IFNULL(meml.real_name, ml.poster_name) AS last_display_name, t.id_first_msg,
 
 				mf.poster_time AS first_poster_time, mf.subject AS first_subject, mf.icon AS first_icon,
 
 				mf.poster_name AS first_member_name, mf.id_member AS first_id_member,
 
 				IFNULL(memf.real_name, mf.poster_name) AS first_display_name, ' . (!empty($modSettings['preview_characters']) ? '
 
 				SUBSTRING(ml.body, 1, ' . ($modSettings['preview_characters'] + 256) . ') AS last_body,
 
-				SUBSTRING(mf.body, 1, ' . ($modSettings['preview_characters'] + 256) . ') AS first_body,' : '') . 'ml.smileys_enabled AS last_smileys, mf.smileys_enabled AS first_smileys
 
+				SUBSTRING(mf.body, 1, ' . ($modSettings['preview_characters'] + 256) . ') AS first_body,' : '') . 'ml.smileys_enabled AS last_smileys, mf.smileys_enabled AS first_smileys,
 
+				IFNULL(a.id_attach, 0) AS id_attach, a.filename, a.attachment_type
 
 			FROM {db_prefix}topics AS t
 
 				INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)
 
 				INNER JOIN {db_prefix}messages AS mf ON (mf.id_msg = t.id_first_msg)
@@ -375,6 +376,7 @@ function MessageIndex()
 
 				LEFT JOIN {db_prefix}members AS memf ON (memf.id_member = mf.id_member)' . ($user_info['is_guest'] ? '' : '
 
 				LEFT JOIN {db_prefix}log_topics AS lt ON (lt.id_topic = t.id_topic AND lt.id_member = {int:current_member})
 
 				LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = {int:current_board} AND lmr.id_member = {int:current_member})'). '
 
+				LEFT JOIN {db_prefix}attachments AS a ON (a.id_member = ml.id_member)
 
 			WHERE ' . ($pre_query ? 't.id_topic IN ({array_int:topic_list})' : 't.id_board = {int:current_board}') . (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
 
 				AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . '
 
 			ORDER BY ' . ($pre_query ? 'FIND_IN_SET(t.id_topic, {string:find_set_topics})' : (!empty($modSettings['enableStickyTopics']) ? 'is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' : '') . $_REQUEST['sort'] . ($ascending ? '' : ' DESC')) . '
@@ -471,6 +473,21 @@ function MessageIndex()
 
 				if (!isset($context['icon_sources'][$row['last_icon']]))
 
 					$context['icon_sources'][$row['last_icon']] = 'images_url';
 
 			}
 
+			
 
+			// Allow themers to show the latest poster's avatar along with the topic
 
+			if(!empty($row['avatar']))
 
+			{
 
+				if ($modSettings['avatar_action_too_large'] == 'option_html_resize' || $modSettings['avatar_action_too_large'] == 'option_js_resize')
 
+				{
 
+					$avatar_width = !empty($modSettings['avatar_max_width_external']) ? ' width="' . $modSettings['avatar_max_width_external'] . '"' : '';
 
+					$avatar_height = !empty($modSettings['avatar_max_height_external']) ? ' height="' . $modSettings['avatar_max_height_external'] . '"' : '';
 
+				}
 
+				else
 
+				{
 
+					$avatar_width = '';
 
+					$avatar_height = '';
 
+				}
 
+			}
 
 
 
 			// 'Print' the topic info.
 
 			$context['topics'][$row['id_topic']] = array(
@@ -500,7 +517,13 @@ function MessageIndex()
 
 						'name' => $row['last_display_name'],
 
 						'id' => $row['last_id_member'],
 
 						'href' => !empty($row['last_id_member']) ? $scripturl . '?action=profile;u=' . $row['last_id_member'] : '',
 
-						'link' => !empty($row['last_id_member']) ? '<a href="' . $scripturl . '?action=profile;u=' . $row['last_id_member'] . '">' . $row['last_display_name'] . '</a>' : $row['last_display_name']
 
+						'link' => !empty($row['last_id_member']) ? '<a href="' . $scripturl . '?action=profile;u=' . $row['last_id_member'] . '">' . $row['last_display_name'] . '</a>' : $row['last_display_name'],
 
+						'avatar' => array(
 
+							'name' => $row['avatar'],
 
+							'image' => $row['avatar'] == '' ? ($row['id_attach'] > 0 ? '<img class="avatar" src="' . (empty($row['attachment_type']) ? $scripturl . '?action=dlattach;attach=' . $row['id_attach'] . ';type=avatar' : $modSettings['custom_avatar_url'] . '/' . $row['filename']) . '" alt="" />' : '') : (stristr($row['avatar'], 'http://') ? '<img class="avatar" src="' . $row['avatar'] . '"' . $avatar_width . $avatar_height . ' alt="" />' : '<img class="avatar" src="' . $modSettings['avatar_url'] . '/' . htmlspecialchars($row['avatar']) . '" alt="" />'),
 
+							'href' => $row['avatar'] == '' ? ($row['id_attach'] > 0 ? (empty($row['attachment_type']) ? $scripturl . '?action=dlattach;attach=' . $row['id_attach'] . ';type=avatar' : $modSettings['custom_avatar_url'] . '/' . $row['filename']) : '') : (stristr($row['avatar'], 'http://') ? $row['avatar'] : $modSettings['avatar_url'] . '/' . $row['avatar']),
 
+							'url' => $row['avatar'] == '' ? '' : (stristr($row['avatar'], 'http://') ? $row['avatar'] : $modSettings['avatar_url'] . '/' . $row['avatar'])
 
+						)
 
 					),
 
 					'time' => timeformat($row['last_poster_time']),
 
 					'timestamp' => forum_time(true, $row['last_poster_time']),
--- a/Sources/Subs-BoardIndex.php
+++ b/Sources/Subs-BoardIndex.php
@@ -53,8 +53,9 @@ function getBoardIndex($boardIndexOptions)
 
 			' . ($user_info['is_guest'] ? ' 1 AS is_read, 0 AS new_from,' : '
 
 			(IFNULL(lb.id_msg, 0) >= b.id_msg_updated) AS is_read, IFNULL(lb.id_msg, -1) + 1 AS new_from,' . ($boardIndexOptions['include_categories'] ? '
 
 			c.can_collapse, IFNULL(cc.id_member, 0) AS is_collapsed,' : '')) . '
 
-			IFNULL(mem.id_member, 0) AS id_member, m.id_msg,
 
-			IFNULL(mods_mem.id_member, 0) AS id_moderator, mods_mem.real_name AS mod_real_name
 
+			IFNULL(mem.id_member, 0) AS id_member, mem.avatar, m.id_msg,
 
+			IFNULL(mods_mem.id_member, 0) AS id_moderator, mods_mem.real_name AS mod_real_name,
 
+			IFNULL(a.id_attach, 0) AS id_attach, a.filename, a.attachment_type
 
 		FROM {db_prefix}boards AS b' . ($boardIndexOptions['include_categories'] ? '
 
 			LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)' : '') . '
 
 			LEFT JOIN {db_prefix}messages AS m ON (m.id_msg = b.id_last_msg)
@@ -63,6 +64,7 @@ function getBoardIndex($boardIndexOptions)
 
 			LEFT JOIN {db_prefix}collapsed_categories AS cc ON (cc.id_cat = c.id_cat AND cc.id_member = {int:current_member})' : '')) . '
 
 			LEFT JOIN {db_prefix}moderators AS mods ON (mods.id_board = b.id_board)
 
 			LEFT JOIN {db_prefix}members AS mods_mem ON (mods_mem.id_member = mods.id_member)
 
+			LEFT JOIN {db_prefix}attachments AS a ON (a.id_member = m.id_member)
 
 		WHERE {query_see_board}' . (empty($boardIndexOptions['countChildPosts']) ? (empty($boardIndexOptions['base_level']) ? '' : '
 
 			AND b.child_level >= {int:child_level}') : '
 
 			AND b.child_level BETWEEN ' . $boardIndexOptions['base_level'] . ' AND ' . ($boardIndexOptions['base_level'] + 1)),
@@ -228,6 +230,21 @@ function getBoardIndex($boardIndexOptions)
 
 		else
 
 			continue;
 
 
 
+		// Allow themers to show the latest poster's avatar along with the board
 
+		if(!empty($row_board['avatar']))
 
+		{
 
+			if ($modSettings['avatar_action_too_large'] == 'option_html_resize' || $modSettings['avatar_action_too_large'] == 'option_js_resize')
 
+			{
 
+				$avatar_width = !empty($modSettings['avatar_max_width_external']) ? ' width="' . $modSettings['avatar_max_width_external'] . '"' : '';
 
+				$avatar_height = !empty($modSettings['avatar_max_height_external']) ? ' height="' . $modSettings['avatar_max_height_external'] . '"' : '';
 
+			}
 
+			else
 
+			{
 
+				$avatar_width = '';
 
+				$avatar_height = '';
 
+			}
 
+		}
 
+
 
 		// Prepare the subject, and make sure it's not too long.
 
 		censorText($row_board['subject']);
 
 		$row_board['short_subject'] = shorten_subject($row_board['subject'], 24);
@@ -242,6 +259,12 @@ function getBoardIndex($boardIndexOptions)
 
 				'name' => $row_board['real_name'],
 
 				'href' => $row_board['poster_name'] != '' && !empty($row_board['id_member']) ? $scripturl . '?action=profile;u=' . $row_board['id_member'] : '',
 
 				'link' => $row_board['poster_name'] != '' ? (!empty($row_board['id_member']) ? '<a href="' . $scripturl . '?action=profile;u=' . $row_board['id_member'] . '">' . $row_board['real_name'] . '</a>' : $row_board['real_name']) : $txt['not_applicable'],
 
+				'avatar' => array(
 
+					'name' => $row_board['avatar'],
 
+					'image' => $row_board['avatar'] == '' ? ($row_board['id_attach'] > 0 ? '<img class="avatar" src="' . (empty($row_board['attachment_type']) ? $scripturl . '?action=dlattach;attach=' . $row_board['id_attach'] . ';type=avatar' : $modSettings['custom_avatar_url'] . '/' . $row_board['filename']) . '" alt="" />' : '') : (stristr($row_board['avatar'], 'http://') ? '<img class="avatar" src="' . $row_board['avatar'] . '"' . $avatar_width . $avatar_height . ' alt="" />' : '<img class="avatar" src="' . $modSettings['avatar_url'] . '/' . htmlspecialchars($row_board['avatar']) . '" alt="" />'),
 
+					'href' => $row_board['avatar'] == '' ? ($row_board['id_attach'] > 0 ? (empty($row_board['attachment_type']) ? $scripturl . '?action=dlattach;attach=' . $row_board['id_attach'] . ';type=avatar' : $modSettings['custom_avatar_url'] . '/' . $row_board['filename']) : '') : (stristr($row_board['avatar'], 'http://') ? $row_board['avatar'] : $modSettings['avatar_url'] . '/' . $row_board['avatar']),
 
+					'url' => $row_board['avatar'] == '' ? '' : (stristr($row_board['avatar'], 'http://') ? $row_board['avatar'] : $modSettings['avatar_url'] . '/' . $row_board['avatar'])
 
+				)
 
 			),
 
 			'start' => 'msg' . $row_board['new_from'],
 
 			'topic' => $row_board['id_topic']