makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Separate display of posted attachments in posting screen and switch for template to indicate adding attachments are allowed. Related to Bug #13871

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8976 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-10-06 13:53:18 +00:00
parent 80b9fd04e0
commit b4d2641a59
3 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/includes/functions_posting.php
View file

@ -765,20 +765,20 @@ function posting_gen_inline_attachments(&$attachment_data)
/** /**
* Generate inline attachment entry * Generate inline attachment entry
*/ */
function posting_gen_attachment_entry($attachment_data, &$filename_data) function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_attach_box = true)
{ {
global $template, $config, $phpbb_root_path, $phpEx, $user; global $template, $config, $phpbb_root_path, $phpEx, $user, $auth;
// Some default template variables
$template->assign_vars(array( $template->assign_vars(array(
'S_SHOW_ATTACH_BOX' => true) 'S_SHOW_ATTACH_BOX' => $show_attach_box,
); 'S_HAS_ATTACHMENTS' => sizeof($attachment_data),
'FILESIZE' => $config['max_filesize'],
'FILE_COMMENT' => (isset($filename_data['filecomment'])) ? $filename_data['filecomment'] : '',
));
if (sizeof($attachment_data)) if (sizeof($attachment_data))
{ {
$template->assign_vars(array(
'S_HAS_ATTACHMENTS' => true)
);
// We display the posted attachments within the desired order. // We display the posted attachments within the desired order.
($config['display_order']) ? krsort($attachment_data) : ksort($attachment_data); ($config['display_order']) ? krsort($attachment_data) : ksort($attachment_data);
@ -808,11 +808,6 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data)
} }
} }
$template->assign_vars(array(
'FILE_COMMENT' => $filename_data['filecomment'],
'FILESIZE' => $config['max_filesize'])
);
return sizeof($attachment_data); return sizeof($attachment_data);
} }

8
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -1036,11 +1036,11 @@ function compose_pm($id, $mode, $action)
// Build custom bbcodes array // Build custom bbcodes array
display_custom_bbcodes(); display_custom_bbcodes();
// Show attachment box for adding attachments if true
$allowed = ($auth->acl_get('u_pm_attach') && $config['allow_pm_attach'] && $form_enctype);
// Attachment entry // Attachment entry
if ($auth->acl_get('u_pm_attach') && $config['allow_pm_attach'] && $form_enctype) posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
{
posting_gen_attachment_entry($attachment_data, $filename_data);
}
// Message History // Message History
if ($action == 'reply' || $action == 'quote' || $action == 'forward') if ($action == 'reply' || $action == 'quote' || $action == 'forward')

9
phpBB/posting.php
View file

@ -1354,12 +1354,11 @@ if (($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_
); );
} }
// Show attachment box for adding attachments if true
$allowed = ($auth->acl_get('f_attach', $forum_id) && $auth->acl_get('u_attach') && $config['allow_attachments'] && $form_enctype);
// Attachment entry // Attachment entry
// Not using acl_gets here, because it is using OR logic posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
if ($auth->acl_get('f_attach', $forum_id) && $auth->acl_get('u_attach') && $config['allow_attachments'] && $form_enctype)
{
posting_gen_attachment_entry($attachment_data, $filename_data);
}
// Output page ... // Output page ...
page_header($page_title); page_header($page_title);