From 80f3d7b0aaeba6e9b2e11b135f04ef13533d1ed4 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 30 Aug 2021 21:28:45 +0200 Subject: [PATCH 1/9] [ticket/16863] Support playing video attachments PHPBB3-16863 --- phpBB/includes/acp/acp_attachments.php | 2 + phpBB/includes/constants.php | 1 + phpBB/includes/functions_content.php | 9 ++ phpBB/install/schemas/schema_data.sql | 6 ++ phpBB/language/en/acp/attachments.php | 1 + .../v400/add_video_files_attachment_group.php | 86 +++++++++++++++++++ phpBB/phpbb/mimetype/extension_guesser.php | 2 + phpBB/phpbb/storage/controller/attachment.php | 3 +- .../styles/prosilver/template/attachment.html | 20 +++++ phpBB/styles/prosilver/theme/content.css | 10 +++ 10 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/add_video_files_attachment_group.php diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index f2d42aef1a..ebfff442a2 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -637,6 +637,7 @@ class acp_attachments ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'], ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'], ATTACHMENT_CATEGORY_AUDIO => $user->lang('CAT_AUDIO_FILES'), + ATTACHMENT_CATEGORY_VIDEO => $user->lang('CAT_VIDEO_FILES'), ); $group_id = $request->variable('g', 0); @@ -1412,6 +1413,7 @@ class acp_attachments ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'], ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'], ATTACHMENT_CATEGORY_AUDIO => $user->lang('CAT_AUDIO_FILES'), + ATTACHMENT_CATEGORY_VIDEO => $user->lang('CAT_VIDEO_FILES'), ); if ($group_id) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 046cbf063b..286a9f2442 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -162,6 +162,7 @@ define('ATTACHMENT_CATEGORY_NONE', 0); define('ATTACHMENT_CATEGORY_IMAGE', 1); // Inline Images define('ATTACHMENT_CATEGORY_THUMB', 4); // Not used within the database, only while displaying posts define('ATTACHMENT_CATEGORY_AUDIO', 7); // Browser-playable audio files +define('ATTACHMENT_CATEGORY_VIDEO', 8); // Browser-playable video files // BBCode UID length define('BBCODE_UID_LEN', 8); diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index f61c7928f8..4dd6fef47e 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1323,6 +1323,15 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a $update_count_ary[] = $attachment['attach_id']; break; + // Audio files + case ATTACHMENT_CATEGORY_VIDEO: + $block_array += [ + 'S_VIDEO_FILE' => true, + ]; + + $update_count_ary[] = $attachment['attach_id']; + break; + default: $l_downloaded_viewed = 'DOWNLOAD_COUNTS'; diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index c3a3ff9876..d708a0d6ad 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -777,6 +777,7 @@ INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, upload_icon INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, upload_icon, max_filesize, allowed_forums) VALUES ('DOCUMENTS', 0, 0, '', 0, ''); INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, upload_icon, max_filesize, allowed_forums) VALUES ('DOWNLOADABLE_FILES', 0, 0, '', 0, ''); INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, upload_icon, max_filesize, allowed_forums) VALUES ('AUDIO_FILES', 7, 0, '', 0, ''); +INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, upload_icon, max_filesize, allowed_forums) VALUES ('VIDEO_FILES', 8, 0, '', 0, ''); # -- extensions INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'gif'); @@ -842,6 +843,11 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'm4a'); INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'ogg'); INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'webm'); +INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'mp4'); +INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'ogg'); +INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'webm'); + + # Add default profile fields INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_location', 'profilefields.type.string', 'phpbb_location', '20', '2', '100', '', '', '.*', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, '', ''); INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_website', 'profilefields.type.url', 'phpbb_website', '40', '12', '255', '', '', '', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 2, 1, 'VISIT_WEBSITE', '%s'); diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 4139f4f8b6..3c8ae0b340 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -69,6 +69,7 @@ $lang = array_merge($lang, array( 'ATTACH_TO_POST' => 'Attach file to post', 'CAT_AUDIO_FILES' => 'Audio files', + 'CAT_VIDEO_FILES' => 'Video files', 'CAT_IMAGES' => 'Images', 'CHECK_CONTENT' => 'Check attachment files', 'CHECK_CONTENT_EXPLAIN' => 'Some browsers can be tricked to assume an incorrect mimetype for uploaded files. This option ensures that such files likely to cause this are rejected.', diff --git a/phpBB/phpbb/db/migration/data/v400/add_video_files_attachment_group.php b/phpBB/phpbb/db/migration/data/v400/add_video_files_attachment_group.php new file mode 100644 index 0000000000..cca0b244a8 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/add_video_files_attachment_group.php @@ -0,0 +1,86 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +class add_video_files_attachment_group extends \phpbb\db\migration\migration +{ + public static function depends_on() + { + return ['\phpbb\db\migration\data\v400\dev']; + } + + public function update_data() + { + return [ + ['custom', [[$this, 'add_video_files']]], + ]; + } + + public function add_video_files() + { + $sql = 'SELECT group_id + FROM ' . $this->table_prefix . 'extension_groups + WHERE ' . $this->db->sql_build_array('SELECT', ['group_name' => 'VIDEO_FILES']); + $result = $this->db->sql_query($sql); + $video_group_id = $this->db->sql_fetchfield('group_id'); + $this->db->sql_freeresult($result); + + if ($video_group_id === false) + { + $sql = 'INSERT INTO ' . $this->table_prefix . 'extension_groups ' . $this->db->sql_build_array('INSERT', [ + 'group_name' => 'VIDEO_FILES', + 'cat_id' => ATTACHMENT_CATEGORY_VIDEO, + 'allow_group' => 0, + 'upload_icon' => '', + 'max_filesize' => 0, + 'allowed_forums' => '', + ]); + $this->db->sql_query($sql); + $video_group_id = $this->db->sql_nextid(); + } + else + { + $sql = 'UPDATE ' . $this->table_prefix . 'extension_groups SET cat_id = ' . ATTACHMENT_CATEGORY_VIDEO . ' + WHERE ' . $this->db->sql_build_array('SELECT', ['group_id' => $video_group_id]); + $this->db->sql_query($sql); + } + + $video_extensions = ['mp4', 'ogg', 'webm']; + + foreach ($video_extensions as $video_extension) + { + $sql = 'SELECT group_id + FROM ' . $this->table_prefix . 'extensions + WHERE ' . $this->db->sql_build_array('SELECT', ['extension' => $video_extension]); + $result = $this->db->sql_query($sql); + $extension_group_id = $this->db->sql_fetchfield('group_id'); + $this->db->sql_freeresult($result); + + if ($extension_group_id === false) + { + $sql = 'INSERT INTO ' . $this->table_prefix . 'extensions ' . $this->db->sql_build_array('INSERT', [ + 'group_id' => $video_group_id, + 'extension' => $video_extension, + ]); + $this->db->sql_query($sql); + } + else if ($extension_group_id != $video_group_id) + { + $sql = 'UPDATE ' . $this->table_prefix . "extensions SET group_id = $video_group_id + WHERE " . $this->db->sql_build_array('SELECT', ['extension' => $video_extension]); + $this->db->sql_query($sql); + } + } + } +} diff --git a/phpBB/phpbb/mimetype/extension_guesser.php b/phpBB/phpbb/mimetype/extension_guesser.php index 19de618df6..67a9d26e35 100644 --- a/phpBB/phpbb/mimetype/extension_guesser.php +++ b/phpBB/phpbb/mimetype/extension_guesser.php @@ -253,6 +253,7 @@ class extension_guesser extends guesser_base 'omc' => 'application/x-omc', 'oga' => 'audio/ogg', 'ogg' => 'audio/ogg', + 'ogg' => 'video/ogg', 'ogm' => 'video/ogg', 'omcd' => 'application/x-omcdatamaker', 'omcr' => 'application/x-omcregerator', @@ -426,6 +427,7 @@ class extension_guesser extends guesser_base 'wbmp' => 'image/vnd.wap.wbmp', 'web' => 'application/vnd.xara', 'webm' => 'audio/webm', + 'webm' => 'video/webm', 'wiz' => 'application/msword', 'wk1' => 'application/x-123', 'wmf' => 'windows/metafile', diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php index 7c3d355ad8..8df2727ea1 100644 --- a/phpBB/phpbb/storage/controller/attachment.php +++ b/phpBB/phpbb/storage/controller/attachment.php @@ -254,7 +254,8 @@ class attachment extends controller $response->headers->set('Content-Type', $attachment['mimetype']); // Display images in browser and force download for other file types - if (strpos($attachment['mimetype'], 'image') !== false || strpos($attachment['mimetype'], 'audio') !== false) + if (strpos($attachment['mimetype'], 'image') !== false || strpos($attachment['mimetype'], 'audio') !== false || + strpos($attachment['mimetype'], 'video') !== false) { $disposition = $response->headers->makeDisposition( ResponseHeaderBag::DISPOSITION_INLINE, diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html index ceeea21d24..7d47ec13d0 100644 --- a/phpBB/styles/prosilver/template/attachment.html +++ b/phpBB/styles/prosilver/template/attachment.html @@ -49,6 +49,26 @@ {% endif %} + {% if _file.S_VIDEO_FILE %} +
+
+ +
+ {% if _file.COMMENT %} +
{{ _file.COMMENT }}
+ {% endif %} +
+ {% if _file.UPLOAD_ICON %} + {{ _file.UPLOAD_ICON }} + {% endif %} + {{ _file.DOWNLOAD_NAME }} + ({{ _file.FILESIZE }} {{ _file.SIZE_LANG }}) {{ _file.L_DOWNLOAD_COUNT }} +
+
+ {% endif %} + diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 04dd1f38e5..2296a15224 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -688,6 +688,16 @@ dl.thumbnail dt a:hover img { max-width: 100%; } +.c-file-audio-source { +} + +.c-file-video-controls { + max-width: 100%; +} + +.c-file-video-source { +} + /* Post poll styles ---------------------------------------- */ fieldset.polls { From 90d92ffdffe0f59c4543e8bc775415985e7fedc5 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 30 Aug 2021 21:31:57 +0200 Subject: [PATCH 2/9] [ticket/16863] Support playing video attachments PHPBB3-16863 --- phpBB/install/schemas/schema_data.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index d708a0d6ad..e716eba55d 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -843,9 +843,9 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'm4a'); INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'ogg'); INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'webm'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'mp4'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'ogg'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'webm'); +INSERT INTO phpbb_extensions (group_id, extension) VALUES (7, 'mp4'); +INSERT INTO phpbb_extensions (group_id, extension) VALUES (7, 'ogg'); +INSERT INTO phpbb_extensions (group_id, extension) VALUES (7, 'webm'); # Add default profile fields From 8726a6a3cb29ab61b651274d437f9f05115015e2 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 30 Aug 2021 22:01:51 +0200 Subject: [PATCH 3/9] [ticket/16863] Support playing video attachments PHPBB3-16863 --- phpBB/phpbb/storage/controller/attachment.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php index 8df2727ea1..9dd7ba445f 100644 --- a/phpBB/phpbb/storage/controller/attachment.php +++ b/phpBB/phpbb/storage/controller/attachment.php @@ -254,8 +254,10 @@ class attachment extends controller $response->headers->set('Content-Type', $attachment['mimetype']); // Display images in browser and force download for other file types - if (strpos($attachment['mimetype'], 'image') !== false || strpos($attachment['mimetype'], 'audio') !== false || - strpos($attachment['mimetype'], 'video') !== false) + if (strpos($attachment['mimetype'], 'image') !== false + || strpos($attachment['mimetype'], 'audio') !== false + || strpos($attachment['mimetype'], 'video') !== false + ) { $disposition = $response->headers->makeDisposition( ResponseHeaderBag::DISPOSITION_INLINE, From 5e796a1e86a7144700f0b59ab9df880d5af717bc Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 30 Aug 2021 22:06:54 +0200 Subject: [PATCH 4/9] [ticket/16863] Support playing video attachments PHPBB3-16863 --- phpBB/includes/functions_content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 4dd6fef47e..2218931d6b 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1323,7 +1323,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a $update_count_ary[] = $attachment['attach_id']; break; - // Audio files + // Video files case ATTACHMENT_CATEGORY_VIDEO: $block_array += [ 'S_VIDEO_FILE' => true, From b042cc5539e7e987fcbe26995c14257554dc62a2 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 30 Aug 2021 22:10:03 +0200 Subject: [PATCH 5/9] [ticket/16863] Support playing video attachments PHPBB3-16863 --- phpBB/styles/prosilver/theme/content.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 2296a15224..592269a0b3 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -689,6 +689,8 @@ dl.thumbnail dt a:hover img { } .c-file-audio-source { + + /** placeholder */ } .c-file-video-controls { @@ -696,6 +698,8 @@ dl.thumbnail dt a:hover img { } .c-file-video-source { + + /** placeholder */ } /* Post poll styles From 52c8de0bd76c611ba6a8afbb4693fa1a399b23b5 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 30 Aug 2021 22:43:11 +0200 Subject: [PATCH 6/9] [ticket/16863] Support playing video attachments PHPBB3-16863 --- phpBB/styles/prosilver/theme/content.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 592269a0b3..0f1ea9fc0f 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -689,7 +689,6 @@ dl.thumbnail dt a:hover img { } .c-file-audio-source { - /** placeholder */ } @@ -698,7 +697,6 @@ dl.thumbnail dt a:hover img { } .c-file-video-source { - /** placeholder */ } From e6e7f5afe3db686c88effe884bd9f9ecac7d232b Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 30 Aug 2021 22:58:06 +0200 Subject: [PATCH 7/9] [ticket/16863] Support playing video attachments Correctly implement audio and video HTML5 tags (there is only one source) PHPBB3-16863 --- phpBB/phpbb/storage/controller/attachment.php | 2 +- phpBB/styles/prosilver/template/attachment.html | 12 ++++-------- phpBB/styles/prosilver/theme/content.css | 8 -------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php index 9dd7ba445f..bde0f357d1 100644 --- a/phpBB/phpbb/storage/controller/attachment.php +++ b/phpBB/phpbb/storage/controller/attachment.php @@ -253,7 +253,7 @@ class attachment extends controller // Content-type header $response->headers->set('Content-Type', $attachment['mimetype']); - // Display images in browser and force download for other file types + // Display file types in browser and force download for others if (strpos($attachment['mimetype'], 'image') !== false || strpos($attachment['mimetype'], 'audio') !== false || strpos($attachment['mimetype'], 'video') !== false diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html index 7d47ec13d0..7d1b0bb818 100644 --- a/phpBB/styles/prosilver/template/attachment.html +++ b/phpBB/styles/prosilver/template/attachment.html @@ -32,9 +32,7 @@ {% if _file.S_AUDIO_FILE %}
- +
{% if _file.COMMENT %}
{{ _file.COMMENT }}
@@ -43,7 +41,7 @@ {% if _file.UPLOAD_ICON %} {{ _file.UPLOAD_ICON }} {% endif %} - {{ _file.DOWNLOAD_NAME }} + {{ _file.DOWNLOAD_NAME }} ({{ _file.FILESIZE }} {{ _file.SIZE_LANG }}) {{ _file.L_DOWNLOAD_COUNT }}
@@ -52,9 +50,7 @@ {% if _file.S_VIDEO_FILE %}
- +
{% if _file.COMMENT %}
{{ _file.COMMENT }}
@@ -63,7 +59,7 @@ {% if _file.UPLOAD_ICON %} {{ _file.UPLOAD_ICON }} {% endif %} - {{ _file.DOWNLOAD_NAME }} + {{ _file.DOWNLOAD_NAME }} ({{ _file.FILESIZE }} {{ _file.SIZE_LANG }}) {{ _file.L_DOWNLOAD_COUNT }}
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 0f1ea9fc0f..d945a14bd6 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -688,18 +688,10 @@ dl.thumbnail dt a:hover img { max-width: 100%; } -.c-file-audio-source { - /** placeholder */ -} - .c-file-video-controls { max-width: 100%; } -.c-file-video-source { - /** placeholder */ -} - /* Post poll styles ---------------------------------------- */ fieldset.polls { From 54ce9704fd3e5c9b0c3b637781d23839571240a5 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Tue, 31 Aug 2021 00:24:23 +0200 Subject: [PATCH 8/9] [ticket/16863] Support playing video attachments PHPBB3-16863 --- phpBB/language/en/acp/attachments.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 3c8ae0b340..56e2ffcafd 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -103,6 +103,7 @@ $lang = array_merge($lang, array( 'EXT_GROUP_IMAGES' => 'Images', 'EXT_GROUP_PLAIN_TEXT' => 'Plain Text', 'EXT_GROUP_AUDIO_FILES' => 'Audio Files', + 'EXT_GROUP_VIDEO_FILES' => 'Video Files', 'FILES_GONE' => 'Some of the attachments you selected for deletion do not exist. They may have been already deleted. Attachments that did exist were deleted.', 'FILES_STATS_WRONG' => 'Your file statistics are likely inaccurate and need to be resynchronised. Actual values: number of attachments = %1$d, total size of attachments = %2$s.
Click %3$shere%4$s to resynchronise them.', From 52d5309bfb3d5c2d95cf6f9f3d87766da407c9ba Mon Sep 17 00:00:00 2001 From: 3D-I Date: Sat, 9 Oct 2021 21:02:05 +0200 Subject: [PATCH 9/9] [ticket/16863] Support playing video attachments PHPBB3-16863 --- phpBB/styles/prosilver/template/attachment.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html index 7d1b0bb818..7d47ec13d0 100644 --- a/phpBB/styles/prosilver/template/attachment.html +++ b/phpBB/styles/prosilver/template/attachment.html @@ -32,7 +32,9 @@ {% if _file.S_AUDIO_FILE %}
- +
{% if _file.COMMENT %}
{{ _file.COMMENT }}
@@ -41,7 +43,7 @@ {% if _file.UPLOAD_ICON %} {{ _file.UPLOAD_ICON }} {% endif %} - {{ _file.DOWNLOAD_NAME }} + {{ _file.DOWNLOAD_NAME }} ({{ _file.FILESIZE }} {{ _file.SIZE_LANG }}) {{ _file.L_DOWNLOAD_COUNT }}
@@ -50,7 +52,9 @@ {% if _file.S_VIDEO_FILE %}
- +
{% if _file.COMMENT %}
{{ _file.COMMENT }}
@@ -59,7 +63,7 @@ {% if _file.UPLOAD_ICON %} {{ _file.UPLOAD_ICON }} {% endif %} - {{ _file.DOWNLOAD_NAME }} + {{ _file.DOWNLOAD_NAME }} ({{ _file.FILESIZE }} {{ _file.SIZE_LANG }}) {{ _file.L_DOWNLOAD_COUNT }}