diff options
| author | Cesar G <prototech91@gmail.com> | 2013-11-10 18:29:49 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-01-17 19:20:36 -0800 |
| commit | 0ea110292b31bff28cced69dc066cc62ed09d208 (patch) | |
| tree | bb32562c2702b6a6e4992c7975c73980a2644806 | |
| parent | be52a823f871682a7740ca3c8207ac7f88f181f5 (diff) | |
| download | forums-0ea110292b31bff28cced69dc066cc62ed09d208.tar forums-0ea110292b31bff28cced69dc066cc62ed09d208.tar.gz forums-0ea110292b31bff28cced69dc066cc62ed09d208.tar.bz2 forums-0ea110292b31bff28cced69dc066cc62ed09d208.tar.xz forums-0ea110292b31bff28cced69dc066cc62ed09d208.zip | |
[ticket/11915] Provide some additional info about limits to the uploader.
PHPBB3-11915
| -rw-r--r-- | phpBB/posting.php | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/plupload.html | 8 |
2 files changed, 11 insertions, 0 deletions
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&t=$topic_id") : '', 'U_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&mode=popup"), 'UA_PROGRESS_BAR' => addslashes(append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&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> |