diff options
| author | Malf Furious <m@lfurio.us> | 2018-10-31 21:23:27 -0400 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2018-10-31 21:23:27 -0400 |
| commit | 2cf8d6be4191512567dc7498d3163627aacd1cf0 (patch) | |
| tree | 7d5a6a5da542fac0ca4701122a53516358bfb95a | |
| parent | 175020d9acd5742d3a3cea4aa8e427ecc046b14b (diff) | |
| download | scrott-2cf8d6be4191512567dc7498d3163627aacd1cf0.tar.gz scrott-2cf8d6be4191512567dc7498d3163627aacd1cf0.zip | |
Fix bug in image support
Adds 'image/x-ms-bmp' as an allowed mimetype for images, and is
equivalent to 'image/bmp'. The image module is also updated to expect
this new type.
I found an image of mine that, when uploaded, PHP thought was
'image/bmp', so it was allowed. However, when cropping, PHP though it
was 'image/x-ms-bmp' and failed to lookup a loading/writing function.
Signed-off-by: Malf Furious <m@lfurio.us>
| -rw-r--r-- | app/class/image.php | 22 | ||||
| -rw-r--r-- | app/class/obj.class.php | 1 |
2 files changed, 13 insertions, 10 deletions
diff --git a/app/class/image.php b/app/class/image.php index 591e026..62999aa 100644 --- a/app/class/image.php +++ b/app/class/image.php @@ -20,17 +20,19 @@ /* * Mappings from image MIME types to PHP open/write functions */ -$_IMG_OPEN_FUNCS['image/jpeg'] = "imagecreatefromjpeg"; -$_IMG_OPEN_FUNCS['image/jpg'] = "imagecreatefromjpeg"; -$_IMG_OPEN_FUNCS['image/png'] = "imagecreatefrompng"; -$_IMG_OPEN_FUNCS['image/gif'] = "imagecreatefromgif"; -$_IMG_OPEN_FUNCS['image/bmp'] = "imagecreatefrombmp"; +$_IMG_OPEN_FUNCS['image/jpeg'] = "imagecreatefromjpeg"; +$_IMG_OPEN_FUNCS['image/jpg'] = "imagecreatefromjpeg"; +$_IMG_OPEN_FUNCS['image/png'] = "imagecreatefrompng"; +$_IMG_OPEN_FUNCS['image/gif'] = "imagecreatefromgif"; +$_IMG_OPEN_FUNCS['image/bmp'] = "imagecreatefrombmp"; +$_IMG_OPEN_FUNCS['image/x-ms-bmp'] = "imagecreatefrombmp"; -$_IMG_WRITE_FUNCS['image/jpeg'] = "imagejpeg"; -$_IMG_WRITE_FUNCS['image/jpg'] = "imagejpeg"; -$_IMG_WRITE_FUNCS['image/png'] = "imagepng"; -$_IMG_WRITE_FUNCS['image/gif'] = "imagegif"; -$_IMG_WRITE_FUNCS['image/bmp'] = "imagebmp"; +$_IMG_WRITE_FUNCS['image/jpeg'] = "imagejpeg"; +$_IMG_WRITE_FUNCS['image/jpg'] = "imagejpeg"; +$_IMG_WRITE_FUNCS['image/png'] = "imagepng"; +$_IMG_WRITE_FUNCS['image/gif'] = "imagegif"; +$_IMG_WRITE_FUNCS['image/bmp'] = "imagebmp"; +$_IMG_WRITE_FUNCS['image/x-ms-bmp'] = "imagebmp"; /* * Open the given image and crop it, such that the result is a square diff --git a/app/class/obj.class.php b/app/class/obj.class.php index 81a0a27..353d617 100644 --- a/app/class/obj.class.php +++ b/app/class/obj.class.php @@ -32,6 +32,7 @@ class obj extends table "image/png", "image/gif", "image/bmp", + "image/x-ms-bmp", ); /* |