v1.2.0-beta

- Added don't show inline image in attatment box
- Added don't show inline image editors preview attatment box
- Fixed typo in language var

Author: IMC-GER

README.md

@@ -10,9 +10,12 @@ This extension can change the image size and/or the image file size. It rotate i
 - No settings. 
 
 #### Settings in Administration Control Panel
+- Create thumbnail
 - Thumbnail compression quality. 
-- Image compression quality. 
-- Maximum image width.
+- Insert full size image in post
+- Maximum image width (Displayed in post)
+- Image compression quality.
+- Maximum image width. (Store on Server)
 - Maximum image heigth.
 - Maximum image file size.
 - Remove EXIF data
@@ -51,7 +54,7 @@ For full functionality "Maximum avatar file size" in "ACP" > "Board configuratio
 
 ## Changelog
 
-### v1.2.0-alpha (09-04-2023)
+### v1.2.0-beta (10-04-2023)
 - Changed sql query for allowed image extensions
 - Changed compression method for png images
 - Added possibility to insert the attachment as an fullsize image in the post message

imcger/imgupload/README.md

@@ -10,9 +10,12 @@ This extension can change the image size and/or the image file size. It rotate i
 - No settings. 
 
 #### Settings in Administration Control Panel
+- Create thumbnail
 - Thumbnail compression quality. 
-- Image compression quality. 
-- Maximum image width.
+- Insert full size image in post
+- Maximum image width (Displayed in post)
+- Image compression quality.
+- Maximum image width. (Store on Server)
 - Maximum image heigth.
 - Maximum image file size.
 - Remove EXIF data
@@ -51,7 +54,7 @@ For full functionality "Maximum avatar file size" in "ACP" > "Board configuratio
 
 ## Changelog
 
-### v1.2.0-alpha (09-04-2023)
+### v1.2.0-beta (10-04-2023)
 - Changed sql query for allowed image extensions
 - Changed compression method for png images
 - Added possibility to insert the attachment as an fullsize image in the post message

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.2.0-alpha",
-	"time": "2023-04-09",
+	"version": "1.2.0-beta",
+	"time": "2023-04-10",
 	"license": "GPL-2.0-only",
 	"authors": [{
 			"name": "Thorsten Ahlers",

imcger/imgupload/event/main_listener.php

@@ -72,6 +72,8 @@ public static function getSubscribedEvents()
 			'core.thumbnail_create_before'				 => 'imcger_create_tumbnail',
 			'core.modify_uploaded_file'					 => 'imcger_modify_uploaded_file',
 			'core.avatar_driver_upload_move_file_before' => 'imcger_modify_uploaded_avatar',
+			'core.viewtopic_modify_post_row'			 => 'imcger_viewtopic_modify_post_row',
+			'core.posting_modify_template_vars'			 => 'imcger_posting_modify_template_vars',
 		];
 	}
 
@@ -351,6 +353,87 @@ function imcger_modify_uploaded_avatar($event)
 		}
 	}
 
+	/**
+	 * Modify post data
+	 * Don't display attachments when shown as image in post message
+	 *
+	 * @param \phpbb\event\data	$event	Event object
+	 */
+	function imcger_viewtopic_modify_post_row($event)
+	{
+		$row				= $event['row'];
+		$post_attachments	= $event['attachments'];
+
+		// Do nothing when no attachment
+		if (!count($post_attachments))
+		{
+			return;
+		}
+
+		// Post message text
+		preg_match_all('#\[img\][\w\<\>\/\.?=&;]*[^\[](id=\d+)\<e\>\[\/img\]#', $row['post_text'], $matches);
+
+		foreach ($matches[1] as $image)
+		{
+			foreach ($post_attachments[$row['post_id']] as $key => $attachment)
+			{
+				if (strpos($attachment, $image))
+				{
+					unset($post_attachments[$row['post_id']][$key]);
+				}
+			}
+		}
+
+		if (count($post_attachments[$row['post_id']]))
+		{
+			$event['attachments'] = $post_attachments;
+		}
+		else
+		{
+			$post_row = $event['post_row'];
+			$post_row['S_HAS_ATTACHMENTS'] = false;
+			$post_row['S_MULTIPLE_ATTACHMENTS'] = false;
+			$event['post_row'] = $post_row;
+
+			$event['attachments'] = $post_attachments;
+		}
+	}
+
+	/**
+	 * Modify post data for post editor preview
+	 * Don't display attachments when shown as image in post message
+	 *
+	 * @param \phpbb\event\data	$event	Event object
+	 */
+	function imcger_posting_modify_template_vars($event)
+	{
+		// Get message text and attachment data
+		$message_parser = $event['message_parser'];
+		$message = $message_parser->message;
+		$attachment_data = $message_parser->attachment_data;
+
+		// Create array with attachment id that insert in post message
+		preg_match_all('#\[img\][\w\<\>\/\.?=&;]*[^\[]id=(\d+)\[\/img\]#', $message, $matches);
+		$matches[1] = array_unique($matches[1]);
+
+		// Check if all attachments insert in post message
+		$display_attachmentbox = false;
+		foreach ($attachment_data as $attachment)
+		{
+			if (!in_array($attachment['attach_id'], $matches[1]))
+			{
+				$display_attachmentbox = true;
+				break;
+			}
+		}
+
+		// Set variable for JS to hide attachment in post editors preview
+		$this->template->assign_vars([
+			'IUL_NOT_DISPLAYED_ATTACHMENTS' => json_encode($matches[1]),
+			'IUL_NOT_DISPLAY_ATTACHMENTBOX' => (int) !$display_attachmentbox,
+		]);
+	}
+
 	/**
 	 * resize image if image to large
 	 *

imcger/imgupload/language/de/common.php

@@ -39,7 +39,7 @@
 
 	// Language pack author
 	'ACP_IMCGER_LANG_DESC'			=> 'Deutsch (Du)',
-	'ACP_IMCGER_LANG_EXT_VER' 		=> '1.2.0-alpha',
+	'ACP_IMCGER_LANG_EXT_VER' 		=> '1.2.0-beta',
 	'ACP_IMCGER_LANG_AUTHOR' 		=> 'IMC-Ger',
 
 	// Messages

imcger/imgupload/language/de_x_sie/common.php

@@ -39,7 +39,7 @@
 
 	// language pack author
 	'ACP_IMCGER_LANG_DESC'			=> 'Deutsch (Sie)',
-	'ACP_IMCGER_LANG_EXT_VER' 		=> '1.2.0-alpha',
+	'ACP_IMCGER_LANG_EXT_VER' 		=> '1.2.0-beta',
 	'ACP_IMCGER_LANG_AUTHOR' 		=> 'IMC-Ger',
 
 	// Messages

imcger/imgupload/language/en/attachment.php

@@ -38,5 +38,5 @@
 $lang = array_merge($lang, [
 	// Post editor settings
 	'PLACE_INLINE'		 => 'Place thumbnail inline',
-	'IMAGE_PLACE_INLINE' => 'Place images inline',
+	'IMAGE_PLACE_INLINE' => 'Place image inline',
 ]);

imcger/imgupload/language/en/common.php

@@ -39,7 +39,7 @@
 
 	// language pack author
 	'ACP_IMCGER_LANG_DESC'			=> 'British English',
-	'ACP_IMCGER_LANG_EXT_VER' 		=> '1.2.0-alpha',
+	'ACP_IMCGER_LANG_EXT_VER' 		=> '1.2.0-beta',
 	'ACP_IMCGER_LANG_AUTHOR' 		=> 'IMC-Ger',
 
 	// Messages

imcger/imgupload/styles/all/template/event/overall_footer_body_after.html

@@ -10,6 +10,35 @@
 	document.forms[form_name].elements[text_name].focus();
 }
 
+/**
+ * Remove attachment in preview when insert as img BBcode in message
+ * AddOn for editor.js
+ *
+ * @var array notDisplayedAttachments	Attachments that insert in the message
+ * @var array notDisplayAttachmentBox	Don't show any attachment
+ */
+function imcgerShowAttachImage() {
+	// Return when no attachments present
+	if (typeof notDisplayAttachmentBox == 'undefined' || notDisplayAttachmentBox && !notDisplayedAttachments.length) {
+		return;
+	}
+
+	if (notDisplayAttachmentBox) {
+		document.getElementsByClassName('attachbox')[0].style.display = 'none';
+	} else {
+		let attachments = document.querySelectorAll(".attachbox .thumbnail");
+
+		attachments.forEach((attachment) => {
+			let link = attachment.getElementsByTagName('a')[0].getAttribute("href");
+			if (notDisplayedAttachments.includes(link.match('id=([0-9]+)')[1])) {
+				attachment.parentElement.style.display = 'none';
+			}
+		});
+	}
+}
+// When load the document, update AttatmentBox in preview
+document.addEventListener ("DOMContentLoaded", () => {imcgerShowAttachImage();});
+
 (function($) {  // Avoid conflicts with other libraries
 
 	'use strict';
@@ -181,6 +210,11 @@
  */
 const imcgerImgUpload = {
 	initialImage: function() {
+		// Return if no content is displayed
+		if (!document.getElementsByClassName("content").length) {
+			return;
+		}
+
 		let postImageArray = document.querySelectorAll(".content img.postimage"),
 			postbodyWidth  = window.getComputedStyle(document.getElementsByClassName("content")[0]).width;
 

imcger/imgupload/styles/all/template/event/posting_preview_content_after.html

@@ -0,0 +1,4 @@
+<script>
+var notDisplayedAttachments = {{ IUL_NOT_DISPLAYED_ATTACHMENTS }},
+	notDisplayAttachmentBox = {{ IUL_NOT_DISPLAY_ATTACHMENTBOX }};
+</script>