Revised template variables

Author: IMC-GER

imcger/imgupload/event/main_listener.php

@@ -102,20 +102,20 @@ public function set_template_vars()
 			$this->language->add_lang('attachment','imcger/imgupload');
 		}
 
-		$allowed_images = '';
+		$allowed_images = [];
 		$img_maxwidth = $this->config['imcger_imgupload_image_inline_maxwidth'];
 
 		$sql = 'SELECT extension FROM ' . EXTENSIONS_TABLE . ' WHERE group_id = (SELECT group_id FROM ' . EXTENSION_GROUPS_TABLE . ' WHERE group_name = "IMAGES")';
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$allowed_images .= '"' . $row['extension'] . '", ';
+			$allowed_images[] = $row['extension'];
 		}
 		$this->db-> sql_freeresult();
 
 		$this->template->assign_vars([
-			'IUL_ALLOWED_IMAGES' => $allowed_images,
+			'IUL_ALLOWED_IMAGES' => json_encode($allowed_images),
 			'IUL_IMG_SET_INLINE' => $this->config['imcger_imgupload_image_inline'],
 			'IUL_IMG_MAXWIDTH'	 => $img_maxwidth ? $img_maxwidth . 'px' : 'none',
 		]);
@@ -370,9 +370,10 @@ function imcger_viewtopic_modify_post_row($event)
 			return;
 		}
 
-		// Post message text
+		// Create array with image id that insert in post message
 		preg_match_all('#\[img\][\w\<\>\/\.?=&;]*[^\[](id=\d+)\<e\>\[\/img\]#', $row['post_text'], $matches);
 
+		// Find image in attachment, delete atachment
 		foreach ($matches[1] as $image)
 		{
 			foreach ($post_attachments[$row['post_id']] as $key => $attachment)
@@ -384,19 +385,20 @@ function imcger_viewtopic_modify_post_row($event)
 			}
 		}
 
-		if (count($post_attachments[$row['post_id']]))
+		$post_row = $event['post_row'];
+
+		// Set template vars
+		if (!empty($post_attachments[$row['post_id']]) && count($post_attachments[$row['post_id']]))
 		{
-			$event['attachments'] = $post_attachments;
+			$post_row['S_MULTIPLE_ATTACHMENTS'] = (bool) (count($post_attachments[$row['post_id']]) > 1);
 		}
 		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;
 		}
+		$event['post_row'] = $post_row;
+		$event['attachments'] = $post_attachments;
 	}
 
 	/**

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

@@ -4,6 +4,8 @@
 /**
  * Add inline attachment at position as image
  * AddOn for editor.js
+ *
+ * @param	string	fileUrl	Image file URL
  */
 function imcgerAttachImage(fileUrl) {
 	insert_text('[img]' + fileUrl + '[/img]');
@@ -14,29 +16,34 @@
  * 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
+ * @var	array	notDisplayedAttachments	Attachments that insert in the message
+ * @var	bool	notDisplayAttachmentBox	Don't show any attachment
  */
 function imcgerShowAttachImage() {
+	const notDisplayedAttachments = {{ IUL_NOT_DISPLAYED_ATTACHMENTS }},
+		  notDisplayAttachmentBox = {{ IUL_NOT_DISPLAY_ATTACHMENTBOX }};
+
 	// Return when no attachments present
 	if (typeof notDisplayAttachmentBox == 'undefined' || notDisplayAttachmentBox && !notDisplayedAttachments.length) {
 		return;
 	}
 
 	if (notDisplayAttachmentBox) {
+		// Hide attachment box
 		document.getElementsByClassName('attachbox')[0].style.display = 'none';
 	} else {
 		let attachments = document.querySelectorAll(".attachbox .thumbnail");
-
+		// Hide attachments that present in array
 		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
+// When load the document, update AttachmentBox in preview
 document.addEventListener ("DOMContentLoaded", () => {imcgerShowAttachImage();});
 
 (function($) {  // Avoid conflicts with other libraries
@@ -93,7 +100,7 @@
 	 */
 	phpbb.plupload.imcgerUpdateRow = function() {
 		$('.file-name.ellipsis-text a').each(function() {
-			const allowedExt = [{{ IUL_ALLOWED_IMAGES }}];
+			const allowedExt	= {{ IUL_ALLOWED_IMAGES }};
 			let link			= $(this),
 				imgUrl			= $(this).attr('href'),
 				real_filename	= $(this).html(),
@@ -136,11 +143,11 @@
 	/**
 	 * Update the relevant elements and hidden data for an attachment.
 	 *
-	 * @param {int} index The index from phpbb.plupload.ids of the attachment to edit.
-	 * @param {array} downloadUrl Optional array of download urls to update.
+	 * @param	int		index The index from phpbb.plupload.ids of the attachment to edit.
+	 * @param	array	downloadUrl Optional array of download urls to update.
 	 */
 	phpbb.plupload.updateRow = function(index, downloadUrl) {
-		const allowedExt	= [{{ IUL_ALLOWED_IMAGES }}];
+		const allowedExt	= {{ IUL_ALLOWED_IMAGES }};
 		let   attach		= phpbb.plupload.data[index],
 			  row			= $('[data-attach-id="' + attach.attach_id + '"]'),
 			  filenameArray = attach.real_filename.split('.'),