v1.3.0

IMC-GER · IMC-GER · commit 4b97998f1f5c · 2023-10-13T18:26:27.000+02:00
- minor code changes
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 This extension is a further development of [canonknipser](https://www.phpbb.com/customise/db/author/canonknipser) [ImageMagick Thumbnailer](https://www.phpbb.com/customise/db/extension/imagemagick_thumbnailer).
 The extension uses the PHP imagick class to modify uploaded images, thumbnails and avatars. It shows a preview image in attachments upload. If the values set in the ACP are exceeded by the image file, the image is being resized by the extension.
 The extension supports JPEG, WEBP, GIF and PNG images. Other image formats, for example BMP, are converted to JPEG when resized.
-This extension can change the image size and/or the image file size. It rotate images, thumbnails and avatars according to their EXIF information and it can remove the EXIF data from JPEG and WEBP files.
+This extension can change the image size and/or the image file size. It rotate images, thumbnails and avatars according to their EXIF information and it can remove the EXIF data from JPEG and WEBP files. Images and thumbnails can also be rotated manually.
 
 #### Settings in User Control Panel
 - No settings. 
@@ -54,8 +54,11 @@ For full functionality "Maximum avatar file size" in "ACP" > "Board configuratio
 
 ## Changelog
 
+### v1.3.0 (13-10-2023)
+- Added manual image rotation
+
 ### v1.2.2 (29-07-2023)
-- Conside BBCode Settings
+- BBCode settings considered
 - Fixed scrollbar on large images in attachbox
 - Fixed button misaligned
 
diff --git a/imcger/imgupload/README.md b/imcger/imgupload/README.md
@@ -4,7 +4,7 @@
 This extension is a further development of [canonknipser](https://www.phpbb.com/customise/db/author/canonknipser) [ImageMagick Thumbnailer](https://www.phpbb.com/customise/db/extension/imagemagick_thumbnailer).
 The extension uses the PHP imagick class to modify uploaded images, thumbnails and avatars. It shows a preview image in attachments upload. If the values set in the ACP are exceeded by the image file, the image is being resized by the extension.
 The extension supports JPEG, WEBP, GIF and PNG images. Other image formats, for example BMP, are converted to JPEG when resized.
-This extension can change the image size and/or the image file size. It rotate images, thumbnails and avatars according to their EXIF information and it can remove the EXIF data from JPEG and WEBP files.
+This extension can change the image size and/or the image file size. It rotate images, thumbnails and avatars according to their EXIF information and it can remove the EXIF data from JPEG and WEBP files. Images and thumbnails can also be rotated manually.
 
 #### Settings in User Control Panel
 - No settings. 
@@ -54,6 +54,9 @@ For full functionality "Maximum avatar file size" in "ACP" > "Board configuratio
 
 ## Changelog
 
+### v1.3.0 (13-10-2023)
+- Added manual image rotation
+
 ### v1.2.2 (29-07-2023)
 - Conside BBCode Settings
 - Fixed scrollbar on large images in attachbox
diff --git a/imcger/imgupload/composer.json b/imcger/imgupload/composer.json
@@ -3,8 +3,8 @@
     "type": "phpbb-extension",
     "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.3.0-b2",
-    "time": "2023-10-08",
+    "version": "1.3.0",
+    "time": "2023-10-13",
     "license": "GPL-2.0-only",
     "authors": [
         {
diff --git a/imcger/imgupload/controller/save_rotated_img_controller.php b/imcger/imgupload/controller/save_rotated_img_controller.php
@@ -9,6 +9,9 @@
 
 namespace imcger\imgupload\controller;
 
+/**
+ * @ignore
+ */
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
diff --git a/imcger/imgupload/event/main_listener.php b/imcger/imgupload/event/main_listener.php
@@ -507,19 +507,23 @@ function set_image_format($image, $mimetype)
 		{
 			case 'image/jpeg':
 				$imageformat = 'JPEG';
-				break;
+			break;
+
 			case 'image/png':
 				$imageformat = 'PNG';
-				break;
+			break;
+
 			case 'image/gif':
 				$imageformat = 'GIF';
-				break;
+			break;
+
 			case 'image/webp':
 				$imageformat = 'WEBP';
-				break;
+			break;
+
 			default:
 				$imageformat = 'JPEG';
-				break;
+			break;
 		}
 
 		$image->setImageFormat($imageformat);
@@ -542,23 +546,24 @@ function set_image_compression($image, $quality = 80)
 			case 'JPEG':
 				$image->setImageCompression(\Imagick::COMPRESSION_JPEG);
 				$image->setImageCompressionQuality($quality);
-				break;
+			break;
 
 			case 'PNG':
 				$image->setOption('png:compression-strategy', 1);
 				$image->setOption('png:compression-filter', 5);
 				$image->setOption('png:compression-level', 9);
-				break;
+				$image->setImageType(\Imagick::IMGTYPE_PALETTEMATTE);
+			break;
 
 			case 'WEBP':
 				$image->setOption('webp:alpha-compression', 1);
 				$image->setOption('webp:method', 6);
 				$image->setImageCompressionQuality($quality);
-				break;
+			break;
 
 			default:
 				// do nothing
-				break;
+			break;
 		}
 	}
 
@@ -587,40 +592,49 @@ function image_auto_rotate($image)
 			case \Imagick::ORIENTATION_UNDEFINED:
 				// do nothing
 				$is_changed = false;
-				break;
+			break;
+
 			case \Imagick::ORIENTATION_TOPLEFT:
 				// do nothing
 				$is_changed = false;
-				break;
+			break;
+
 			case \Imagick::ORIENTATION_TOPRIGHT:
 				$image->flopImage();
-				break;
+			break;
+
 			case \Imagick::ORIENTATION_BOTTOMRIGHT:
 				$image->rotateImage("#000", 180);
-				break;
+			break;
+
 			case \Imagick::ORIENTATION_BOTTOMLEFT:
 				$image->flipImage();
-				break;
+			break;
+
 			case \Imagick::ORIENTATION_LEFTTOP:
 				$image->transposeImage();
 				$is_rotate = true;
-				break;
+			break;
+
 			case \Imagick::ORIENTATION_RIGHTTOP:
 				$image->rotateImage("#000", 90);
 				$is_rotate = true;
-				break;
+			break;
+
 			case \Imagick::ORIENTATION_RIGHTBOTTOM:
 				$image->transverseImage();
 				$is_rotate = true;
-				break;
+			break;
+
 			case \Imagick::ORIENTATION_LEFTBOTTOM:
 				$image->rotateImage("#000", 270);
 				$is_rotate = true;
-				break;
+			break;
+
 			default:
 				// do nothing
 				$is_changed = false;
-				break;
+			break;
 		}
 
 		// set the orientation from the Image
diff --git a/imcger/imgupload/styles/all/template/event/overall_footer_body_after.html b/imcger/imgupload/styles/all/template/event/overall_footer_body_after.html
@@ -140,18 +140,18 @@
 			deg_ziel  = deg == 0 ? 360 : deg;
 			deg_start = deg_ziel - 90;
 		} else {
-			deg_ziel  = (deg - 360) == (-360) ? 0 : (deg - 360);
+			deg_ziel  = deg == 0 ? 0 : deg - 360;
 			deg_start = deg_ziel + 90;
 		}
 
 		image.animate(
-		  [
-			{ transform: 'rotate(' + deg_start + 'deg)' },
-			{ transform: 'rotate(' + deg_ziel + 'deg)' },
-		  ],
-		  {
-			duration: 150,
-		  },
+			[
+				{ transform: 'rotate(' + deg_start + 'deg)' },
+				{ transform: 'rotate(' + deg_ziel + 'deg)' },
+			],
+			{
+				duration: 150,
+			},
 		);
 
 		image.style.webkitTransform = 'rotate(' + deg + 'deg)';
diff --git a/imgupload_version.json b/imgupload_version.json
@@ -1,7 +1,7 @@
 {
     "stable": {
         "1.0": {
-            "current": "1.2.2",
+            "current": "1.3.0",
             "announcement": "https://www.phpbb.de/community/viewtopic.php?t=246009",
             "download": "https://github.com/IMC-GER/phpBB-Image-upload-use-ImageMagick/tags",
             "eol": null,

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"stable": {`
`3`	`3`	`"1.0": {`
`4`		`- "current": "1.2.2",`
	`4`	`+ "current": "1.3.0",`
`5`	`5`	`"announcement": "https://www.phpbb.de/community/viewtopic.php?t=246009",`
`6`	`6`	`"download": "https://github.com/IMC-GER/phpBB-Image-upload-use-ImageMagick/tags",`
`7`	`7`	`"eol": null,`