2 files changed, 46 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 1c3c43c8e9..c62fefae46 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1097,8 +1097,8 @@ class acp_attachments
 
 				// Sorting
 				$limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
-				$sort_by_text = array('f' => $user->lang['FILENAME'], 't' => $user->lang['FILEDATE'], 's' => $user->lang['FILESIZE'], 'x' => $user->lang['EXTENSION'], 'd' => $user->lang['DOWNLOADS'],'p' => $user->lang['ATTACH_POST_ID'], 'u' => $user->lang['AUTHOR']);
-				$sort_by_sql = array('f' => 'a.real_filename', 't' => 'a.filetime', 's' => 'a.filesize', 'x' => 'a.extension', 'd' => 'a.download_count', 'p' => 'a.post_msg_id', 'u' => 'u.username');
+				$sort_by_text = array('f' => $user->lang['FILENAME'], 't' => $user->lang['FILEDATE'], 's' => $user->lang['FILESIZE'], 'x' => $user->lang['EXTENSION'], 'd' => $user->lang['DOWNLOADS'],'p' => $user->lang['ATTACH_POST_TYPE'], 'u' => $user->lang['AUTHOR']);
+				$sort_by_sql = array('f' => 'a.real_filename', 't' => 'a.filetime', 's' => 'a.filesize', 'x' => 'a.extension', 'd' => 'a.download_count', 'p' => 'a.in_message', 'u' => 'u.username');
 
 				$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
 				gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
@@ -1109,27 +1109,62 @@ class acp_attachments
 
 				$attachments_per_page = (int) $config['topics_per_page'];
 
-				$num_files = (int) $config['num_files'];
-				$total_size = (int) $config['upload_dir_size'];
+				// Handle files stats resync
+				$action = request_var('action', '');
+				$resync_files_stats = false;
+				if ($action && $action = 'stats')
+				{
+					if (!confirm_box(true))
+					{
+						confirm_box(false, $user->lang['RESYNC_FILES_STATS_CONFIRM'], build_hidden_fields(array(
+							'i'			=> $id,
+							'mode'		=> $mode,
+							'action'	=> $action,
+						)));
+					}
+					else
+					{
+						$resync_files_stats = true;
+						add_log('admin', 'LOG_RESYNC_FILES_STATS');
+					}
+				}
 
-				// Check if files statistics is accurate
+				// Check if files stats are accurate
 				$sql = 'SELECT COUNT(attach_id) as num_files
 					FROM ' . ATTACHMENTS_TABLE . '
 					WHERE is_orphan = 0';
 				$result = $db->sql_query($sql, 600);
 				$num_files_real = (int) $db->sql_fetchfield('num_files');
+				if ($resync_files_stats === true)
+				{
+					set_config('num_files', $num_files_real, true);
+				}
 				$db->sql_freeresult($result);
 
 				$sql = 'SELECT SUM(filesize) as upload_dir_size
 					FROM ' . ATTACHMENTS_TABLE . '
 					WHERE is_orphan = 0';
 				$result = $db->sql_query($sql, 600);
-				$total_size_real = (int) $db->sql_fetchfield('upload_dir_size');
+				$total_size_real = (float) $db->sql_fetchfield('upload_dir_size');
+				if ($resync_files_stats === true)
+				{
+					set_config('upload_dir_size', $total_size_real, true);
+				}
 				$db->sql_freeresult($result);
 
+				// Get current files stats
+				$num_files = (int) $config['num_files'];
+				$total_size = (float) $config['upload_dir_size'];
+
+				// Issue warning message if files stats are inaccurate
 				if (($num_files != $num_files_real) || ($total_size != $total_size_real))
 				{
-					$error[] = sprintf($user->lang['FILES_STAT_WRONG'], $num_files_real, get_formatted_filesize($total_size_real));
+					$error[] = sprintf($user->lang['FILES_STATS_WRONG'], $num_files_real, get_formatted_filesize($total_size_real));
+
+					$template->assign_vars(array(
+						'S_ACTION_OPTIONS'	=> ($auth->acl_get('a_board')) ? true : false,
+						'U_ACTION'			=> $this->u_action,)
+					);					
 				}
 
 				// Make sure $start is set to the last page if it exceeds the amount
@@ -1207,7 +1242,7 @@ class acp_attachments
 					$row = $attachments_list[$i];
 
 					$row['extension'] = strtolower(trim((string) $row['extension']));
-					$comment = ($row['attach_comment']) ? str_replace(array("\n", "\r"), array('<br />', "\n"), $row['attach_comment']) : '';
+					$comment = ($row['attach_comment'] && !$row['in_message']) ? str_replace(array("\n", "\r"), array('<br />', "\n"), $row['attach_comment']) : '';
 					$display_cat = $extensions[$row['extension']]['display_cat'];
 					$l_downloaded_viewed = ($display_cat == ATTACHMENT_CATEGORY_NONE) ? 'DOWNLOAD_COUNT' : 'VIEWED_COUNT';
 					$l_download_count = (!isset($row['download_count']) || (int) $row['download_count'] == 0) ? $user->lang[$l_downloaded_viewed . '_NONE'] : (((int) $row['download_count'] == 1) ? sprintf($user->lang[$l_downloaded_viewed], $row['download_count']) : sprintf($user->lang[$l_downloaded_viewed . 'S'], $row['download_count']));
@@ -1216,8 +1251,9 @@ class acp_attachments
 						'ATTACHMENT_POSTER'	=> get_username_string('full', (int) $row['poster_id'], (string) $row['username'], (string) $row['user_colour'], (string) $row['username']),
 						'FILESIZE'			=> get_formatted_filesize((int) $row['filesize']),
 						'FILETIME'			=> $user->format_date((int) $row['filetime']),
-						'REAL_FILENAME'		=> utf8_wordwrap(utf8_basename((string) $row['real_filename']), 40, '<br />', true),
+						'REAL_FILENAME'		=> (!$row['in_message']) ? utf8_wordwrap(utf8_basename((string) $row['real_filename']), 40, '<br />', true) : '',
 						'PHYSICAL_FILENAME'	=> utf8_basename((string) $row['physical_filename']),
+						'EXT_GROUP_NAME'	=> (!empty($extensions[$row['extension']]['group_name'])) ? $user->lang['EXT_GROUP_' . $extensions[$row['extension']]['group_name']] : '',
 						'COMMENT'			=> $comment,
 						'TOPIC_TITLE'		=> (!$row['in_message']) ? (string) $row['topic_title'] : '',
 						'ATTACH_ID'			=> (int) $row['attach_id'],
diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php
index 68026c8647..0c01953d55 100644
--- a/phpBB/includes/cache/service.php
+++ b/phpBB/includes/cache/service.php
@@ -194,6 +194,7 @@ class phpbb_cache_service
 					'max_filesize'	=> (int) $row['max_filesize'],
 					'allow_group'	=> $row['allow_group'],
 					'allow_in_pm'	=> $row['allow_in_pm'],
+					'group_name'	=> $row['group_name'],
 				);
 
 				$allowed_forums = ($row['allowed_forums']) ? unserialize(trim($row['allowed_forums'])) : array();