From cb54f56c3db0bedefaa76113f7491203962004ed Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 02:39:44 +0100
Subject: [PATCH 1/4] [ticket/11586] Combine administrator/moderator checks
 together.

PHPBB3-11586
---
 phpBB/includes/functions_posting.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e823f8be75..8b4a833d8e 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -434,15 +434,15 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	// Do we have to create a thumbnail?
 	$filedata['thumbnail'] = ($cat_id == ATTACHMENT_CATEGORY_IMAGE && $config['img_create_thumbnail']) ? 1 : 0;
 
-	// Check Image Size, if it is an image
-	if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id) && $cat_id == ATTACHMENT_CATEGORY_IMAGE)
-	{
-		$file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']);
-	}
-
-	// Admins and mods are allowed to exceed the allowed filesize
 	if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id))
 	{
+		// Check Image Size, if it is an image
+		if ($cat_id == ATTACHMENT_CATEGORY_IMAGE)
+		{
+			$file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']);
+		}
+
+		// Admins and mods are allowed to exceed the allowed filesize
 		if (!empty($extensions[$file->get('extension')]['max_filesize']))
 		{
 			$allowed_filesize = $extensions[$file->get('extension')]['max_filesize'];

From 11c80c040243244757ea75ef4ab23a70a725254f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 02:43:48 +0100
Subject: [PATCH 2/4] [ticket/11586] Use a variable for $cat_id ==
 ATTACHMENT_CATEGORY_IMAGE.

PHPBB3-11586
---
 phpBB/includes/functions_posting.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 8b4a833d8e..a31d3b5a3f 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -429,15 +429,16 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 		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?
-	$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))
 	{
 		// 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']);
 		}
@@ -457,10 +458,9 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 
 	$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.
-	$no_image = ($cat_id == ATTACHMENT_CATEGORY_IMAGE) ? false : true;
-
-	$file->move_file($config['upload_path'], false, $no_image);
+	// Are we uploading an image *and* this image being within the image category?
+	// Only then perform additional image checks.
+	$file->move_file($config['upload_path'], false, !$is_image);
 
 	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...
-	if ($cat_id == ATTACHMENT_CATEGORY_IMAGE && !$file->is_image())
+	if ($is_image && !$file->is_image())
 	{
 		$file->remove();
 

From 50e3173e8c2f8304ad79e228df8526f9caf7b999 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 02:46:12 +0100
Subject: [PATCH 3/4] [ticket/11586] Combine $filedata['post_attach'] assign
 into a single statement.

PHPBB3-11586
---
 phpBB/includes/functions_posting.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index a31d3b5a3f..d6f7c9bab4 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -403,14 +403,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 		$upload->set_disallowed_content(explode('|', $config['mime_triggers']));
 	}
 
-	if (!$local)
-	{
-		$filedata['post_attach'] = ($upload->is_valid($form_name)) ? true : false;
-	}
-	else
-	{
-		$filedata['post_attach'] = true;
-	}
+	$filedata['post_attach'] = $local || $upload->is_valid($form_name);
 
 	if (!$filedata['post_attach'])
 	{

From 5fa25880e23f1ad72321da2e04c574d99f5546a2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 02:49:48 +0100
Subject: [PATCH 4/4] [ticket/11586] Move $filedata['thumbnail'] to where it
 might be returned.

PHPBB3-11586
---
 phpBB/includes/functions_posting.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index d6f7c9bab4..b9b518ad32 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -425,9 +425,6 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	// 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?
-	$filedata['thumbnail'] = ($is_image && $config['img_create_thumbnail']) ? 1 : 0;
-
 	if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id))
 	{
 		// Check Image Size, if it is an image
@@ -455,6 +452,9 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	// Only then perform additional image checks.
 	$file->move_file($config['upload_path'], false, !$is_image);
 
+	// Do we have to create a thumbnail?
+	$filedata['thumbnail'] = ($is_image && $config['img_create_thumbnail']) ? 1 : 0;
+
 	if (sizeof($file->error))
 	{
 		$file->remove();