v1.3.2-b1

IMC-GER · IMC-GER · commit d41ef77d26e9 · 2023-12-12T18:15:50.000+01:00
- Fixed error when upload image after upload none image file
- Fixed don't change attachment id in IMG bbCode after image rotated
- Changed Symfony json response tp phpBB response
- Added support for Toggle Control from LukeWCS
diff --git a/imcger/imgupload/adm/style/acp_imgupload_body.html b/imcger/imgupload/adm/style/acp_imgupload_body.html
@@ -1,4 +1,5 @@
 {% INCLUDE 'overall_header.html' %}
+{% set switch_type = TOGGLECTRL_TYPE ?? 'toggle' %}
 
 <h1>{{ lang('ACP_IMCGER_IMGUPLOAD_TITLE') }}</h1>
 
@@ -11,25 +12,25 @@ <h1>{{ lang('ACP_IMCGER_IMGUPLOAD_TITLE') }}</h1>
 		<dl>
 			<dt><label for="img_create_thumbnail">{{ lang('CREATE_THUMBNAIL') ~ lang('COLON') }}</label><br/><span>{{ lang('CREATE_THUMBNAIL_EXPLAIN') }}</span></dt>
 			<dd>
-				{{ _self.switch('img_create_thumbnail', CREATE_THUMBNAIL) }}
+				{{ _self.switch('img_create_thumbnail', CREATE_THUMBNAIL, switch_type) }}
 			</dd>
 		</dl>
 		<dl>
 			<dt><label for="imcger_imgupload_tum_quality">{{ lang('ACP_IMCGER_THUMB_QUALITY') ~ lang('COLON') }}</label><br/><span>{{ lang('ACP_IMCGER_THUMB_QUALITY_DESC') }}</span></dt>
 			<dd>
-				<input type="number" id="imcger_imgupload_tum_quality" min="50" max="90" step="any" maxlength="3" name="imcger_imgupload_tum_quality" value="{{ IMCGER_TUM_QUALITY }}">
+				{{ _self.number('imcger_imgupload_tum_quality', IMCGER_TUM_QUALITY, 50, 90) }}
 			</dd>
 		</dl>
 		<dl>
 			<dt><label for="imcger_imgupload_image_inline">{{ lang('ACP_IMCGER_IMAGE_INLINE') ~ lang('COLON') }}</label><br/><span>{{ lang('ACP_IMCGER_IMAGE_INLINE_DESC') }}</span></dt>
 			<dd>
-				{{ _self.switch('imcger_imgupload_image_inline', IMCGER_IMGUPLOAD_IMAGE_INLINE) }}
+				{{ _self.switch('imcger_imgupload_image_inline', IMCGER_IMGUPLOAD_IMAGE_INLINE, switch_type) }}
 			</dd>
 		</dl>
 		<dl>
 			<dt><label for="imcger_imgupload_img_max_thumb_width">{{ lang('ACP_IMCGER_IMG_MAX_THUMB_WIDTH') ~ lang('COLON') }}</label><br/><span>{{ lang('ACP_IMCGER_IMG_MAX_THUMB_WIDTH_DESC') }}</span></dt>
 			<dd>
-				<input type="number" id="imcger_imgupload_img_max_thumb_width" min="0" max="99999" step="any" maxlength="3" name="imcger_imgupload_img_max_thumb_width" value="{{ IMCGER_IMG_MAX_THUMB_WIDTH }}"> px
+				{{ _self.number('imcger_imgupload_img_max_thumb_width', IMCGER_IMG_MAX_THUMB_WIDTH, 0, 99999) }}
 			</dd>
 		</dl>
 	</fieldset>
@@ -38,23 +39,29 @@ <h1>{{ lang('ACP_IMCGER_IMGUPLOAD_TITLE') }}</h1>
 		<legend>{{ lang('ACP_IMCGER_SETTINGS_IMAGE') }}</legend>
 		<dl>
 			<dt><label for="imcger_imgupload_img_quality">{{ lang('ACP_IMCGER_IMAGE_QUALITY') ~ lang('COLON') }}</label><br/><span>{{ lang('ACP_IMCGER_IMAGE_QUALITY_DESC') }}</span></dt>
-			<dd><input type="number" id="imcger_imgupload_img_quality" min="50" max="90" step="any" maxlength="3" name="imcger_imgupload_img_quality" value="{{ IMCGER_IMG_QUALITY }}"></dd>
+			<dd>
+				{{ _self.number('imcger_imgupload_img_quality', IMCGER_IMG_QUALITY, 50, 90) }}
+			</dd>
 		</dl>
 
 		<dl>
 			<dt><label for="imcger_imgupload_max_width">{{ lang('ACP_IMCGER_MAX_SIZE') ~ lang('COLON') }}</label><br/><span>{{ lang('ACP_IMCGER_MAX_SIZE_DESC') }}</span></dt>
-			<dd><input type="number" id="imcger_imgupload_max_width" min="0" max="9999999999" step="any" maxlength="10" name="imcger_imgupload_max_width" value="{{ IMCGER_MAX_WIDTH }}"> x <input type="number" id="imcger_imgupload_max_height" min="0" max="9999999999" step="any" maxlength="10" name="imcger_imgupload_max_height" value="{{ IMCGER_MAX_HEIGHT }}"> px</dd>
+			<dd>
+				{{ _self.number('imcger_imgupload_max_width', IMCGER_MAX_WIDTH, 0, 99999) }} x {{ _self.number('imcger_imgupload_max_height', IMCGER_MAX_HEIGHT, 0, 99999) }}
+			</dd>
 		</dl>
 
 		<dl>
 			<dt><label for="imcger_imgupload_max_filesize">{{ lang('ACP_IMCGER_MAX_FILESIZE') ~ lang('COLON') }}</label><br/><span>{{ lang('ACP_IMCGER_MAX_FILESIZE_DESC') }}</span></dt>
-			<dd><input type="number" id="imcger_imgupload_max_filesize" min="0" max="9999999999" step="any" name="imcger_imgupload_max_filesize" value="{{ IMCGER_MAX_FILESIZE }}"/> <select name="size_select"><option value="b" {% if IMCGER_UNIT == 'b' %} selected="selected"{% endif %}>Bytes</option><option value="kb" {% if IMCGER_UNIT == 'kb' %} selected="selected"{% endif %}>KiB</option><option value="mb" {% if IMCGER_UNIT == 'mb' %} selected="selected"{% endif %}>MiB</option></select></dd>
+			<dd>
+				{{ _self.number('imcger_imgupload_max_filesize', IMCGER_MAX_FILESIZE, 0, 9999999999) }} <select name="size_select"><option value="b" {% if IMCGER_UNIT == 'b' %} selected="selected"{% endif %}>Bytes</option><option value="kb" {% if IMCGER_UNIT == 'kb' %} selected="selected"{% endif %}>KiB</option><option value="mb" {% if IMCGER_UNIT == 'mb' %} selected="selected"{% endif %}>MiB</option></select>
+			</dd>
 		</dl>
 
 		<dl>
 			<dt><label for="imcger_imgupload_del_exif">{{ lang('ACP_IMCGER_DEL_EXIF') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_IMCGER_DEL_EXIF_DESC') }}</span></dt>
 			<dd>
-				{{ _self.switch('imcger_imgupload_del_exif', IMCGER_DEL_EXIF) }}
+				{{ _self.switch('imcger_imgupload_del_exif', IMCGER_DEL_EXIF, switch_type) }}
 			</dd>
 		</dl>
 	</fieldset>
@@ -65,7 +72,7 @@ <h1>{{ lang('ACP_IMCGER_IMGUPLOAD_TITLE') }}</h1>
 			<dt><label for="imcger_imgupload_avatar_resize">{{ lang('ACP_IMCGER_AVATAR_RESIZE') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_IMCGER_AVATAR_RESIZE_DESC') }}</span>
 				{% if IMCGER_AVATAR_FILESIZE_ISSET %}<br><span style="color: red">{{ lang('ACP_IMCGER_AVATAR_FILESIZE_ISSET') }}</span>{% endif %}</dt>
 			<dd>
-				{{ _self.switch('imcger_imgupload_avatar_resize', IMCGER_AVATAR_RESIZE) }}
+				{{ _self.switch('imcger_imgupload_avatar_resize', IMCGER_AVATAR_RESIZE, switch_type) }}
 			</dd>
 		</dl>
 	</fieldset>
@@ -92,6 +99,32 @@ <h1>{{ lang('ACP_IMCGER_IMGUPLOAD_TITLE') }}</h1>
 {% INCLUDECSS '@imcger_imgupload/acp_imgupload.css' %}
 {% INCLUDEJS '@imcger_imgupload/acp_imgupload.js' %}
 
-{% macro switch(name, checked = false) -%}
-	<input type="checkbox" class="toggle" id="{{ name }}" name="{{ name }}" value="1"{{ checked ? ' checked' }}>
+{#
+	Twig Macros
+	@copyright (c) 2023 LukeWCS, https://github.com/LukeWCS
+#}
+
+{% macro switch(name, checked = false, type = 'toggle') -%}
+	{% if type == 'toggle' || type == 'checkbox' -%}
+		<input type="checkbox"{{ type == 'toggle' ? ' class="toggle"' }} name="{{ name }}" value="1"{{ checked ? ' checked' }}>
+	{%- elseif type == 'radio' -%}
+		<label><input type="radio" class="radio" name="{{ name }}" value="1"{{ checked ? ' checked' }}> {{ lang('YES') }}</label>
+		<label><input type="radio" class="radio" name="{{ name }}" value="0"{{ !checked ? ' checked' }}> {{ lang('NO') }}</label>
+	{%- endif %}
+{%- endmacro %}
+
+{% macro select(name, value, options) -%}
+	<select name="{{ name }}">
+		{% for opt_lang_var, opt_value in options %}
+			<option value="{{ opt_value }}"{{ opt_value == value ? ' selected' }}>{{ lang(opt_lang_var) }}</option>
+		{% endfor %}
+	</select>
+{%- endmacro %}
+
+{% macro number(name, value, min, max, step = 1, placeholder = '') -%}
+	<input type="number" name="{{ name }}" value="{{ value }}" min="{{ min }}" max="{{ max }}" step="{{ step }}"{{ placeholder ? ' placeholder="' ~ placeholder ~ '"' }}>
+{%- endmacro %}
+
+{% macro text(name, value, size = 10, placeholder = '', pattern = '') -%}
+	<input type="text" name="{{ name }}" value="{{ value }}" size="{{ size }}"{{ placeholder ? ' placeholder="' ~ placeholder ~ '"' }}{{ pattern ? ' pattern="' ~ pattern ~ '"' }}>
 {%- endmacro %}
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.1",
-    "time": "2023-10-15",
+    "version": "1.3.2-b1",
+    "time": "2023-12-10",
     "license": "GPL-2.0-only",
     "authors": [
         {
diff --git a/imcger/imgupload/controller/admin_controller.php b/imcger/imgupload/controller/admin_controller.php
@@ -128,6 +128,7 @@ protected function set_variable()
 		$this->config->set('img_create_thumbnail', $this->request->variable('img_create_thumbnail', 0));
 		$this->config->set('imcger_imgupload_image_inline', $this->request->variable('imcger_imgupload_image_inline', 0));
 		$this->config->set('imcger_imgupload_img_max_thumb_width', $this->request->variable('imcger_imgupload_img_max_thumb_width', 0));
+		$this->config->set('imcger_imgupload_avatar_resize', $this->request->variable('imcger_imgupload_avatar_resize', 0));
 	}
 
 	/**
diff --git a/imcger/imgupload/controller/save_rotated_img_controller.php b/imcger/imgupload/controller/save_rotated_img_controller.php
@@ -12,7 +12,6 @@
 /**
  * @ignore
  */
-use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
  * Main controller
@@ -101,7 +100,7 @@ public function save_image()
 		// No user logged in, redirect in js to login page
 		if ($this->user->data['user_id'] == ANONYMOUS)
 		{
-			return $this->json_response(3);
+			$this->json_response(3);
 		}
 
 		$img_attach_id	= $this->request->variable('attach_id', '');
@@ -113,7 +112,7 @@ public function save_image()
 
 		if (!$img_attach_id || !$img_rotate_deg)
 		{
-			return $this->json_response(5, $ext_display_name, $this->language->lang('IUL_WRONG_PARAM'));
+			$this->json_response(5, $ext_display_name, $this->language->lang('IUL_WRONG_PARAM'));
 		}
 
 		if ($this->auth->acl_gets('u_attach', 'a_attach', 'f_attach'))
@@ -129,7 +128,7 @@ public function save_image()
 
 		if (!isset($img_data) || $img_data == false)
 		{
-			return $this->json_response(4, $ext_display_name, $this->language->lang('IUL_NO_IMG_IN_DATABASE'));
+			$this->json_response(4, $ext_display_name, $this->language->lang('IUL_NO_IMG_IN_DATABASE'));
 		}
 
 		// Get image file path
@@ -142,7 +141,7 @@ public function save_image()
 		}
 		else
 		{
-			return $this->json_response(4, $ext_display_name, $this->language->lang('IUL_IMG_NOT_EXIST'));
+			$this->json_response(4, $ext_display_name, $this->language->lang('IUL_IMG_NOT_EXIST'));
 		}
 
 		if ($img_data['thumbnail'] && file_exists($thumb_file_path))
@@ -151,7 +150,7 @@ public function save_image()
 		}
 		else if ($img_data['thumbnail'])
 		{
-			return $this->json_response(4, $ext_display_name, $this->language->lang('IUL_THUMB_NOT_EXIST'));
+			$this->json_response(4, $ext_display_name, $this->language->lang('IUL_THUMB_NOT_EXIST'));
 		}
 
 		// Update DataBase
@@ -167,11 +166,11 @@ public function save_image()
 			$sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $img_attach_id;
 			$this->db->sql_query($sql);
 
-			return $this->json_response(0, $ext_display_name, '', $img_attach_id, $new_attach_id);
+			$this->json_response(0, $ext_display_name, '', $img_attach_id, $new_attach_id);
 		}
 		else
 		{
-			return $this->json_response(5, $ext_display_name, $this->language->lang('IUL_DATABASE_NOT_UPDATE'));
+			$this->json_response(5, $ext_display_name, $this->language->lang('IUL_DATABASE_NOT_UPDATE'));
 		}
 	}
 
@@ -207,14 +206,13 @@ private function rotate_image($path, $deg)
 	 */
 	private function json_response($status, $title = '', $message = '', $old_attach_id = 0, $new_attach_id = 0)
 	{
-		$json = new JsonResponse([
+		$json_response = new \phpbb\json_response;
+		$json_response->send([
 			'status'		=> (int) $status,
 			'title'			=> $title,
 			'message'		=> $message,
 			'oldAttachId'	=> (int) $old_attach_id,
 			'newAttachId'	=> (int) $new_attach_id,
 		]);
-
-		return $json;
 	}
 }
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
@@ -3,6 +3,7 @@
 <script>
 /**
  * Update row with new attachment id
+ * when save image after rotate
  *
  * @param	string	returnStr	old and new attach id
  */
@@ -74,6 +75,11 @@
 	// Replace [attachment=imc-ger] with [attachment=0]
 	messageText = document.getElementById('message').value;
 	messageText = messageText.replace(/\[attachment=imc-ger\]/gm, '[attachment=0]');
+
+	// Replace [img]oldURL[/img] with [img]newURL[/img]
+	regex		= new RegExp('view&id=' + oldAttachId + '\\[\\/img\\]', 'gm');
+	messageText = messageText.replace(regex, 'view&id=' + newAttachId + '[/img]');
+
 	document.getElementById('message').value = messageText;
 
 	phpbb.plupload.updateRows();
@@ -153,7 +159,7 @@
 
 	rotate: function(attach_id, deg, clockwise) {
 		let image = document.getElementById('img-' + attach_id),
-		deg_start, deg_ziel;
+			deg_start, deg_ziel;
 
 		if (clockwise) {
 			deg_ziel  = deg == 0 ? 360 : deg;
@@ -283,16 +289,10 @@
 	 * Delete a attached file.
 	 */
 	$('#file-list').on('click', '.file-delete', function(e) {
-		var row = $(this).parents('.attach-row'),
+		var row		 = $(this).parents('.attach-row'),
 			attachId = row.attr('data-attach-id');
 
-		// Hack to avoid the error 503
-		setTimeout(() => {
-			phpbb.plupload.deleteFile(row, attachId);
 			phpbb.plupload.imcgerDelImgBbcode(attachId);
-		}, 1000);
-
-		e.preventDefault();
 	});
 
 	/**
@@ -410,7 +410,6 @@
 									   '<button class="button" type="button" onclick="imcgerIupl.rotateLeft(' + attach.attach_id + ')" ><i id="fa-undo" class="icon fa-undo fa-fw" aria-hidden="true"></i></button><br>' +
 									   '<button class="button" type="button" onclick="imcgerIuplSaveImg(' + attach.attach_id + ', this)" ><i id="fa-save" class="icon fa-save fa-fw" aria-hidden="true"></i></button></span>';
 
-
 		// Add the link to the file
 		if (typeof downloadUrl !== 'undefined' && typeof downloadUrl[index] !== 'undefined') {
 			let url = downloadUrl[index].replace('&amp;', '&'),
@@ -453,29 +452,30 @@
 					// Do nothing wenn click on image
 					link.attr('onclick', 'return false;');
 				}
-			} else {
-				link.attr('href', url).html(attach.real_filename);
-			}
 
-			// Add thumnail and buttons to rotate it
-			row.find('.file-name').html(link);
-			row.find('.file-name a').after(imcgerButtonsForRotate);
+				// Add thumnail and buttons to rotate it
+				row.find('.file-name').html(link);
+				row.find('.file-name a').after(imcgerButtonsForRotate);
 
-			// Set max height to Image
-			maxImgHeight = parseInt($('.file-name img').css('max-height').replace(/px/, ''));
-			link.height(maxImgHeight + 'px');
+				// Set max height to Image
+				maxImgHeight = parseInt($('.file-name img').css('max-height').replace(/px/, ''));
+				link.height(maxImgHeight + 'px');
 
-			// Hack for vertically centered image
-			$('#img-' + attach.attach_id).on('load', function(e) {
-				let imgHeight = maxImgHeight;
+				// Hack for vertically centered image
+				$('#img-' + attach.attach_id).on('load', function(e) {
+					let imgHeight = maxImgHeight;
 
-				// The $(this) element work not all time
-				if (e.target.height < e.target.width) {
-					imgHeight = maxImgHeight / e.target.width * e.target.height;
-				}
+					// The $(this) element work not all time
+					if (e.target.height < e.target.width) {
+						imgHeight = maxImgHeight / e.target.width * e.target.height;
+					}
 
-				$(this).css('margin-top', ((maxImgHeight - parseInt(imgHeight)) / 2));
-			});
+					$(this).css('margin-top', ((maxImgHeight - parseInt(imgHeight)) / 2));
+				});
+			} else {
+				link.attr('href', url).html(attach.real_filename);
+				row.find('.file-name').html(link);
+			}
 		}
 
 		row.find('textarea').attr('name', 'comment_list[' + index + ']');

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ protected function set_variable()`
`128`	`128`	`$this->config->set('img_create_thumbnail', $this->request->variable('img_create_thumbnail', 0));`
`129`	`129`	`$this->config->set('imcger_imgupload_image_inline', $this->request->variable('imcger_imgupload_image_inline', 0));`
`130`	`130`	`$this->config->set('imcger_imgupload_img_max_thumb_width', $this->request->variable('imcger_imgupload_img_max_thumb_width', 0));`
	`131`	`+ $this->config->set('imcger_imgupload_avatar_resize', $this->request->variable('imcger_imgupload_avatar_resize', 0));`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`/**`
`13`	`13`	`* @ignore`
`14`	`14`	`*/`
`15`		`-use Symfony\Component\HttpFoundation\JsonResponse;`
`16`	`15`
`17`	`16`	`/**`
`18`	`17`	`* Main controller`
`@@ -101,7 +100,7 @@ public function save_image()`
`101`	`100`	`// No user logged in, redirect in js to login page`
`102`	`101`	`if ($this->user->data['user_id'] == ANONYMOUS)`
`103`	`102`	`{`
`104`		`- return $this->json_response(3);`
	`103`	`+ $this->json_response(3);`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`$img_attach_id = $this->request->variable('attach_id', '');`
`@@ -113,7 +112,7 @@ public function save_image()`
`113`	`112`
`114`	`113`	`if (!$img_attach_id \|\| !$img_rotate_deg)`
`115`	`114`	`{`
`116`		`- return $this->json_response(5, $ext_display_name, $this->language->lang('IUL_WRONG_PARAM'));`
	`115`	`+ $this->json_response(5, $ext_display_name, $this->language->lang('IUL_WRONG_PARAM'));`
`117`	`116`	`}`
`118`	`117`
`119`	`118`	`if ($this->auth->acl_gets('u_attach', 'a_attach', 'f_attach'))`
`@@ -129,7 +128,7 @@ public function save_image()`
`129`	`128`
`130`	`129`	`if (!isset($img_data) \|\| $img_data == false)`
`131`	`130`	`{`
`132`		`- return $this->json_response(4, $ext_display_name, $this->language->lang('IUL_NO_IMG_IN_DATABASE'));`
	`131`	`+ $this->json_response(4, $ext_display_name, $this->language->lang('IUL_NO_IMG_IN_DATABASE'));`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`// Get image file path`
`@@ -142,7 +141,7 @@ public function save_image()`
`142`	`141`	`}`
`143`	`142`	`else`
`144`	`143`	`{`
`145`		`- return $this->json_response(4, $ext_display_name, $this->language->lang('IUL_IMG_NOT_EXIST'));`
	`144`	`+ $this->json_response(4, $ext_display_name, $this->language->lang('IUL_IMG_NOT_EXIST'));`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`if ($img_data['thumbnail'] && file_exists($thumb_file_path))`
`@@ -151,7 +150,7 @@ public function save_image()`
`151`	`150`	`}`
`152`	`151`	`else if ($img_data['thumbnail'])`
`153`	`152`	`{`
`154`		`- return $this->json_response(4, $ext_display_name, $this->language->lang('IUL_THUMB_NOT_EXIST'));`
	`153`	`+ $this->json_response(4, $ext_display_name, $this->language->lang('IUL_THUMB_NOT_EXIST'));`
`155`	`154`	`}`
`156`	`155`
`157`	`156`	`// Update DataBase`
`@@ -167,11 +166,11 @@ public function save_image()`
`167`	`166`	`$sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $img_attach_id;`
`168`	`167`	`$this->db->sql_query($sql);`
`169`	`168`
`170`		`- return $this->json_response(0, $ext_display_name, '', $img_attach_id, $new_attach_id);`
	`169`	`+ $this->json_response(0, $ext_display_name, '', $img_attach_id, $new_attach_id);`
`171`	`170`	`}`
`172`	`171`	`else`
`173`	`172`	`{`
`174`		`- return $this->json_response(5, $ext_display_name, $this->language->lang('IUL_DATABASE_NOT_UPDATE'));`
	`173`	`+ $this->json_response(5, $ext_display_name, $this->language->lang('IUL_DATABASE_NOT_UPDATE'));`
`175`	`174`	`}`
`176`	`175`	`}`
`177`	`176`
`@@ -207,14 +206,13 @@ private function rotate_image($path, $deg)`
`207`	`206`	`*/`
`208`	`207`	`private function json_response($status, $title = '', $message = '', $old_attach_id = 0, $new_attach_id = 0)`
`209`	`208`	`{`
`210`		`- $json = new JsonResponse([`
	`209`	`+ $json_response = new \phpbb\json_response;`
	`210`	`+ $json_response->send([`
`211`	`211`	`'status' => (int) $status,`
`212`	`212`	`'title' => $title,`
`213`	`213`	`'message' => $message,`
`214`	`214`	`'oldAttachId' => (int) $old_attach_id,`
`215`	`215`	`'newAttachId' => (int) $new_attach_id,`
`216`	`216`	`]);`
`217`		`-`
`218`		`- return $json;`
`219`	`217`	`}`
`220`	`218`	`}`