From 0ea110292b31bff28cced69dc066cc62ed09d208 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 10 Nov 2013 18:29:49 -0800
Subject: [PATCH] [ticket/11915] Provide some additional info about limits to
 the uploader.

PHPBB3-11915
---
 phpBB/posting.php                             | 3 +++
 phpBB/styles/prosilver/template/plupload.html | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/phpBB/posting.php b/phpBB/posting.php
index 192fc69f47..1711b91093 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1464,6 +1464,7 @@ $template->assign_vars(array(
 	'L_POST_A'					=> $page_title,
 	'L_ICON'					=> ($mode == 'reply' || $mode == 'quote' || ($mode == 'edit' && $post_id != $post_data['topic_first_post_id'])) ? $user->lang['POST_ICON'] : $user->lang['TOPIC_ICON'],
 	'L_MESSAGE_BODY_EXPLAIN'	=> $user->lang('MESSAGE_BODY_EXPLAIN', (int) $config['max_post_chars']),
+	'L_TOO_MANY_ATTACHMENTS'	=> $user->lang('TOO_MANY_ATTACHMENTS', (int) $config['max_attachments']),
 
 	'FORUM_NAME'			=> $post_data['forum_name'],
 	'FORUM_DESC'			=> ($post_data['forum_desc']) ? generate_text_for_display($post_data['forum_desc'], $post_data['forum_desc_uid'], $post_data['forum_desc_bitfield'], $post_data['forum_desc_options']) : '',
@@ -1487,6 +1488,8 @@ $template->assign_vars(array(
 	'U_VIEW_TOPIC'			=> ($mode != 'post') ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id") : '',
 	'U_PROGRESS_BAR'		=> append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&amp;mode=popup"),
 	'UA_PROGRESS_BAR'		=> addslashes(append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&amp;mode=popup")),
+	'ATTACH_ORDER'			=> ($config['display_order']) ? 'asc' : 'desc',
+	'MAX_ATTACHMENTS'		=> ($auth->acl_get('a_') || $auth->acl_get('m_', $forum_id)) ? 0 : (int) $config['max_attachments'],
 
 	'S_PRIVMSGS'				=> false,
 	'S_CLOSE_PROGRESS_WINDOW'	=> (isset($_POST['add_file'])) ? true : false,
diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html
index 290992ddd6..2f68fe3efe 100644
--- a/phpBB/styles/prosilver/template/plupload.html
+++ b/phpBB/styles/prosilver/template/plupload.html
@@ -59,6 +59,14 @@ phpbb.plupload = {
 		form_hook: '#postform'
 	}
 };
+	},
+	lang: {
+		ERROR: '{LA_ERROR}',
+		TOO_MANY_ATTACHMENTS: '{LA_TOO_MANY_ATTACHMENTS}',
+	},
+	order: '{ATTACH_ORDER}',
+	max_files: {MAX_ATTACHMENTS},
+}
 //]]>
 </script>
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/plupload.js"></script>