From 818955062a10919312bf038b58c4eb8718a04134 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Fri, 10 Sep 2010 00:02:05 +0100
Subject: [PATCH 1/3] [ticket/7252] Replace magic values with PHP constants.

fileupload::image_types() contained hardcoded references to values of built
in PHP constants, these have been replaced with the constants instead now.

PHPBB3-7252
---
 phpBB/includes/functions_upload.php | 32 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index 7f09cc1640..9346a17883 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -989,22 +989,22 @@ class fileupload
 	function image_types()
 	{
 		return array(
-			1 => array('gif'),
-			2 => array('jpg', 'jpeg'),
-			3 => array('png'),
-			4 => array('swf'),
-			5 => array('psd'),
-			6 => array('bmp'),
-			7 => array('tif', 'tiff'),
-			8 => array('tif', 'tiff'),
-			9 => array('jpg', 'jpeg'),
-			10 => array('jpg', 'jpeg'),
-			11 => array('jpg', 'jpeg'),
-			12 => array('jpg', 'jpeg'),
-			13 => array('swc'),
-			14 => array('iff'),
-			15 => array('wbmp'),
-			16 => array('xbm'),
+			IMAGETYPE_GIF => array('gif'),
+			IMAGETYPE_JPEG => array('jpg', 'jpeg'),
+			IMAGETYPE_PNG => array('png'),
+			IMAGETYPE_SWF => array('swf'),
+			IMAGETYPE_PSD => array('psd'),
+			IMAGETYPE_BMP => array('bmp'),
+			IMAGETYPE_TIFF_II => array('tif', 'tiff'),
+			IMAGETYPE_TIFF_MM => array('tif', 'tiff'),
+			IMAGETYPE_JPC => array('jpg', 'jpeg'),
+			IMAGETYPE_JP2 => array('jpg', 'jpeg'),
+			IMAGETYPE_JPX => array('jpg', 'jpeg'),
+			IMAGETYPE_JB2 => array('jpg', 'jpeg'),
+			IMAGETYPE_SWC => array('swc'),
+			IMAGETYPE_IFF => array('iff'),
+			IMAGETYPE_WBMP => array('wbmp'),
+			IMAGETYPE_XBM => array('xbm'),
 		);
 	}
 }

From 0a50a02b66e9a921b1b798e40fe5f70ce5a23fa1 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Fri, 10 Sep 2010 00:10:40 +0100
Subject: [PATCH 2/3] [ticket/7252] Replace magic values with PHP constants.

get_supported_image_types() in includes/functions_posting.php contained
the values of PHP constants hardcoded instead of using the constants.

PHPBB3-7252
---
 phpBB/includes/functions_posting.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 5e25648eb8..6a53213230 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -564,26 +564,27 @@ function get_supported_image_types($type = false)
 			switch ($type)
 			{
 				// GIF
-				case 1:
+				case IMAGETYPE_GIF:
 					$new_type = ($format & IMG_GIF) ? IMG_GIF : false;
 				break;
 
 				// JPG, JPC, JP2
-				case 2:
-				case 9:
-				case 10:
-				case 11:
-				case 12:
+				case IMAGETYPE_JPEG:
+				case IMAGETYPE_JPC:
+				case IMAGETYPE_JPEG2000:
+				case IMAGETYPE_JP2:
+				case IMAGETYPE_JPX:
+				case IMAGETYPE_JB2:
 					$new_type = ($format & IMG_JPG) ? IMG_JPG : false;
 				break;
 
 				// PNG
-				case 3:
+				case IMAGETYPE_PNG:
 					$new_type = ($format & IMG_PNG) ? IMG_PNG : false;
 				break;
 
 				// WBMP
-				case 15:
+				case IMAGETYPE_WBMP:
 					$new_type = ($format & IMG_WBMP) ? IMG_WBMP : false;
 				break;
 			}

From 0edcf575a097b9cd0ad5f264da9874ef81c9dadb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 12 Sep 2010 13:26:17 +0200
Subject: [PATCH 3/3] [ticket/7252] Align array keys and values to "=>".

PHPBB3-7252
---
 phpBB/includes/functions_upload.php | 32 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index 9346a17883..eeb90049e6 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -989,22 +989,22 @@ class fileupload
 	function image_types()
 	{
 		return array(
-			IMAGETYPE_GIF => array('gif'),
-			IMAGETYPE_JPEG => array('jpg', 'jpeg'),
-			IMAGETYPE_PNG => array('png'),
-			IMAGETYPE_SWF => array('swf'),
-			IMAGETYPE_PSD => array('psd'),
-			IMAGETYPE_BMP => array('bmp'),
-			IMAGETYPE_TIFF_II => array('tif', 'tiff'),
-			IMAGETYPE_TIFF_MM => array('tif', 'tiff'),
-			IMAGETYPE_JPC => array('jpg', 'jpeg'),
-			IMAGETYPE_JP2 => array('jpg', 'jpeg'),
-			IMAGETYPE_JPX => array('jpg', 'jpeg'),
-			IMAGETYPE_JB2 => array('jpg', 'jpeg'),
-			IMAGETYPE_SWC => array('swc'),
-			IMAGETYPE_IFF => array('iff'),
-			IMAGETYPE_WBMP => array('wbmp'),
-			IMAGETYPE_XBM => array('xbm'),
+			IMAGETYPE_GIF		=> array('gif'),
+			IMAGETYPE_JPEG		=> array('jpg', 'jpeg'),
+			IMAGETYPE_PNG		=> array('png'),
+			IMAGETYPE_SWF		=> array('swf'),
+			IMAGETYPE_PSD		=> array('psd'),
+			IMAGETYPE_BMP		=> array('bmp'),
+			IMAGETYPE_TIFF_II	=> array('tif', 'tiff'),
+			IMAGETYPE_TIFF_MM	=> array('tif', 'tiff'),
+			IMAGETYPE_JPC		=> array('jpg', 'jpeg'),
+			IMAGETYPE_JP2		=> array('jpg', 'jpeg'),
+			IMAGETYPE_JPX		=> array('jpg', 'jpeg'),
+			IMAGETYPE_JB2		=> array('jpg', 'jpeg'),
+			IMAGETYPE_SWC		=> array('swc'),
+			IMAGETYPE_IFF		=> array('iff'),
+			IMAGETYPE_WBMP		=> array('wbmp'),
+			IMAGETYPE_XBM		=> array('xbm'),
 		);
 	}
 }