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] [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'),
 		);
 	}
 }