v1.0.0

Author: IMC-GER

README.md

@@ -1,8 +1,8 @@
 # phpBB Image upload use ImageMagick
 
 ## Description
-This extension us the PHP imagick class to modify upload image for improved quality.
-It can change the image size and/or the image file size. Rotate thumbnails according to their exif information. Remove EXIF data.
+This extension us the PHP Imagick class to modify upload image for improved quality.
+This extension can change the image size and/or the image file size. It rotate images and thumbnails according to their EXIF information and it can remove the EXIF data.
 
 #### Settings in User Control Panel
 - No settings. 
@@ -31,11 +31,11 @@ For full functionality "Maximum image dimensions" in "ACP" > "Posting" > "Attach
 - Click the `Disable` link for "Image upload use ImageMagick".
 - Delete the `imgupload` folder from `phpBB3/ext/imcger/`.
 - Copy the extension to `phpBB3/ext/imcger/imgupload`.
-- Go to "ACP" > "Customise" > "Manage extensions" and enable the "Collapse Quote" extension.
+- Go to "ACP" > "Customise" > "Manage extensions" and enable the "Image upload use ImageMagick" extension.
 
 ## Changelog
 
-### v1.0.0 (09-07-2022)
+### v1.0.0 (21-07-2022)
 - Version check
 - Check system requirement
 - Controller for ACP template

imcger/imgupload/README.md

@@ -2,7 +2,7 @@
 
 ## Description
 This extension us the PHP imagick class to modify upload image for improved quality.
-It can change the image size and/or the image file size. Rotate thumbnails according to their exif information. Remove EXIF data.
+This extension can change the image size and/or the image file size. It rotate images and thumbnails according to their EXIF information and it can remove the EXIF data.
 
 #### Settings in User Control Panel
 - No settings. 
@@ -31,11 +31,11 @@ For full functionality "Maximum image dimensions" in "ACP" > "Posting" > "Attach
 - Click the `Disable` link for "Image upload use ImageMagick".
 - Delete the `imgupload` folder from `phpBB3/ext/imcger/`.
 - Copy the extension to `phpBB3/ext/imcger/imgupload`.
-- Go to "ACP" > "Customise" > "Manage extensions" and enable the "Collapse Quote" extension.
+- Go to "ACP" > "Customise" > "Manage extensions" and enable the "Image upload use ImageMagick" extension.
 
 ## Changelog
 
-### v1.0.0 (09-07-2022)
+### v1.0.0 (21-07-2022)
 - Version check
 - Check system requirement
 - Controller for ACP template

imcger/imgupload/composer.json

@@ -4,7 +4,7 @@
 	"description": "Using ImageMagick php librarie for resize image attachments and creating thumbnails.",
 	"homepage": "https://github.com/IMC-GER/phpBB-Image-upload-use-ImageMagick/tags",
 	"version": "1.0.0",
-	"time": "2022-07-09",
+	"time": "2022-07-21",
 	"license": "GPL-2.0-only",
 	"authors": [{
 			"name": "Thorsten Ahlers",

imcger/imgupload/event/main_listener.php

@@ -5,7 +5,6 @@
  * An extension for the phpBB Forum Software package.
  *
  * @copyright (c) 2022, Thorsten Ahlers
- * @copyright (c) 2019, ftc2, Auto-Resize Images Server-side
  * @copyright (c) 2018, canonknipser, ImageMagick Thumbnailer, http://canonknipser.com
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
@@ -78,25 +77,22 @@ public function imcger_create_tumbnail($event)
 		}
 
 		/* resize the Image */
-		$thumbnail->resizeImage($new_width, $new_height, \Imagick::FILTER_LANCZOS, 1, false);
+		$thumbnail->resizeImage($new_width, $new_height, \Imagick::FILTER_LANCZOS, 1);
 
 		/* Set image format */
-		$this->set_image_format($thumbnail, $event['mimetype']);
+		$image_format = $this->set_image_format($thumbnail, $event['mimetype']);
 
 		/* Compression quality is read from config, set in ACP */
 		$this->set_image_compression($thumbnail, $this->config['imcger_imgupload_tum_quality']);
 
 		/* Strip EXIF data and image profile */
-		if ($this->config['imcger_imgupload_del_exif'])
+		if ($this->config['imcger_imgupload_del_exif'] && $image_format == 'JPEG')
 		{
 			$thumbnail->stripImage();
 		}
 
 		/* Store the image */
-		if ($thumbnail->writeImage($event['destination']))
-		{
-			$thumbnail_created = true;
-		}
+		$thumbnail_created = $thumbnail->writeImage($event['destination']);
 
 		/* set return value */
 		$event['thumbnail_created'] = $thumbnail_created;
@@ -112,8 +108,6 @@ public function imcger_modify_uploaded_file($event)
 		if ($event['is_image'])
 		{
 			$write_image		= false; // set to true wenn image attribute changed
-			$image_max_width	= $this->config['imcger_imgupload_max_width'];
-			$image_max_height	= $this->config['imcger_imgupload_max_height'];
 			$image_quality		= $this->config['imcger_imgupload_img_quality'];
 			$image_del_exif		= $this->config['img_strip_metadata'];
 			$image_max_filesize = $this->config['imcger_imgupload_max_filesize'];
@@ -127,36 +121,8 @@ public function imcger_modify_uploaded_file($event)
 			/* rotate the image according it's orientation flag */
 			$img = $this->image_auto_rotate($image);
 
-			/* get image dimensions */
-			$width	= $image->getImageWidth();
-			$height = $image->getImageHeight();
-
-			/* image side ratio */
-			$side_ratio = $width / $height;
-
-			/* set new images width */
-			if ($image_max_width && $image_max_width < $width)
-			{
-				$width = $image_max_width;
-				$height = (int) ($width / $side_ratio);
-
-				$write_image = true;
-			}
-
-			/* set new images height */
-			if ($image_max_height && $image_max_height < $height)
-			{
-				$height = $image_max_height;
-				$width = (int) ($height * $side_ratio);
-
-				$write_image = true;
-			}
-
-			/* when changed dimensions resize the Image */
-			if ($write_image)
-			{
-				$image->resizeImage($width, $height, \Imagick::FILTER_LANCZOS, 1, false);
-			}
+			/* resize the image */
+			$write_image = $this->resize_image($image);
 
 			/* set image format */
 			$image_format = $this->set_image_format($image, $event['filedata']['mimetype']);
@@ -204,6 +170,53 @@ public function imcger_modify_uploaded_file($event)
 		}
 	}
 
+	/**
+	 * resize image if image to large
+	 *
+	 * @param object	$image	image object
+	 *
+	 * @return bool		$img_resize	images is resize
+	 */
+	function resize_image($image)
+	{
+		$image_max_width	= $this->config['imcger_imgupload_max_width'];
+		$image_max_height	= $this->config['imcger_imgupload_max_height'];
+		$img_resize			= false;
+
+		/* get image dimensions */
+		$width	= $image->getImageWidth();
+		$height = $image->getImageHeight();
+
+		/* image side ratio */
+		$side_ratio = $width / $height;
+
+		/* set new images width */
+		if ($image_max_width && $image_max_width < $width)
+		{
+			$width = $image_max_width;
+			$height = (int) ($width / $side_ratio);
+
+			$img_resize = true;
+		}
+
+		/* set new images height */
+		if ($image_max_height && $image_max_height < $height)
+		{
+			$height = $image_max_height;
+			$width = (int) ($height * $side_ratio);
+
+			$img_resize = true;
+		}
+
+		/* when changed dimensions resize the Image */
+		if ($img_resize)
+		{
+			$image->resizeImage($width, $height, \Imagick::FILTER_LANCZOS, 1, false);
+		}
+
+		return $img_resize;
+	}
+
 	/**
 	 * set the image format for the generated image
 	 *
@@ -315,17 +328,15 @@ function image_auto_rotate($image)
 				$image->flipImage();
 				break;
 			case \Imagick::ORIENTATION_LEFTTOP:
-				$image->flipImage();
-				$image->rotateImage("#000", 90);
+				$image->transposeImage();
 				$is_rotate = true;
 				break;
 			case \Imagick::ORIENTATION_RIGHTTOP:
 				$image->rotateImage("#000", 90);
 				$is_rotate = true;
 				break;
 			case \Imagick::ORIENTATION_RIGHTBOTTOM:
-				$image->flopImage();
-				$image->rotateImage("#000", 90);
+				$image->transverseImage();
 				$is_rotate = true;
 				break;
 			case \Imagick::ORIENTATION_LEFTBOTTOM: