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

[ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.

Browse source 
PHPBB3-11586
This commit is contained in:
Andreas Fischer 2013-03-04 02:43:48 +01:00
parent cb54f56c3d
commit 11c80c0402
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/includes/functions_posting.php
View file

@ -429,15 +429,16 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
return $filedata; return $filedata;
} }
$cat_id = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] : ATTACHMENT_CATEGORY_NONE; // Whether the uploaded file is in the image category
$is_image = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] == ATTACHMENT_CATEGORY_IMAGE : false;
// Do we have to create a thumbnail? // Do we have to create a thumbnail?
$filedata['thumbnail'] = ($cat_id == ATTACHMENT_CATEGORY_IMAGE && $config['img_create_thumbnail']) ? 1 : 0; $filedata['thumbnail'] = ($is_image && $config['img_create_thumbnail']) ? 1 : 0;
if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id)) if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id))
{ {
// Check Image Size, if it is an image // Check Image Size, if it is an image
if ($cat_id == ATTACHMENT_CATEGORY_IMAGE) if ($is_image)
{ {
$file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']); $file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']);
} }
@ -457,10 +458,9 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
$file->clean_filename('unique', $user->data['user_id'] . '_'); $file->clean_filename('unique', $user->data['user_id'] . '_');
// Are we uploading an image *and* this image being within the image category? Only then perform additional image checks. // Are we uploading an image *and* this image being within the image category?
$no_image = ($cat_id == ATTACHMENT_CATEGORY_IMAGE) ? false : true; // Only then perform additional image checks.
$file->move_file($config['upload_path'], false, !$is_image);
$file->move_file($config['upload_path'], false, $no_image);
if (sizeof($file->error)) if (sizeof($file->error))
{ {
@ -472,7 +472,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
} }
// Make sure the image category only holds valid images... // Make sure the image category only holds valid images...
if ($cat_id == ATTACHMENT_CATEGORY_IMAGE && !$file->is_image()) if ($is_image && !$file->is_image())
{ {
$file->remove(); $file->remove();