v1.5.0

- Fixed Language variables are lost when 'Create thumbnail' is deactivated.
- Fixed Error message from Composer Validator
- Fixed Each PHP statement must be on a line by itself
- Set max php version to 8.4, min version to 7.4
- Changed PHP code has been updated to include data types for the variable
- Changed security query in the Ajax controller
- Changed sql query from string to array
- Revised language files
- Moved twig macros in separate file

Author: IMC-GER

.github/workflows/tests.yml

@@ -21,4 +21,4 @@ jobs:
       RUN_PGSQL_JOBS: 0
       RUN_MSSQL_JOBS: 0
       RUN_WINDOWS_JOBS: 0
-      PRIMARY_PHP_VERSION: '8.3'
+      PRIMARY_PHP_VERSION: '8.4'

imcger/imgupload/acp/main_module.php

@@ -15,11 +15,11 @@
  */
 class main_module
 {
-	public $page_title;
-	public $tpl_name;
-	public $u_action;
+	public string $page_title;
+	public string $tpl_name;
+	public string $u_action;
 
-	public function main($id, $mode)
+	public function main(string $id, string $mode): void
 	{
 		global $phpbb_container;
 

imcger/imgupload/adm/style/acp_imgupload_body.html

@@ -1,4 +1,18 @@
+{#
+ * Image upload use ImageMagick
+ * An extension for the phpBB Forum Software package.
+ *
+ * @copyright (c) 2022, Thorsten Ahlers
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ #}
+
+{% INCLUDECSS '@imcger_imgupload/acp_toggle.css' %}
+{% INCLUDECSS '@imcger_imgupload/acp_imgupload.css' %}
+{% INCLUDEJS '@imcger_imgupload/acp_imgupload.js' %}
+
 {% INCLUDE 'overall_header.html' %}
+{% import '@imcger_imgupload/twig_macros.html' as common %}
 {% set switch_type = TOGGLECTRL_TYPE ?? 'toggle' %}
 
 <h1>{{ lang('ACP_IMCGER_IMGUPLOAD_TITLE') }}</h1>
@@ -12,25 +26,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, switch_type) }}
+				{{ common.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>
-				{{ _self.number('imcger_imgupload_tum_quality', IMCGER_TUM_QUALITY, 50, 90) }}
+				{{ common.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, switch_type) }}
+				{{ common.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>
-				{{ _self.number('imcger_imgupload_img_max_thumb_width', IMCGER_IMG_MAX_THUMB_WIDTH, 0, 99999) }}
+				{{ common.number('imcger_imgupload_img_max_thumb_width', IMCGER_IMG_MAX_THUMB_WIDTH, 0, 99999) }}
 			</dd>
 		</dl>
 	</fieldset>
@@ -40,28 +54,30 @@ <h1>{{ lang('ACP_IMCGER_IMGUPLOAD_TITLE') }}</h1>
 		<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>
-				{{ _self.number('imcger_imgupload_img_quality', IMCGER_IMG_QUALITY, 50, 90) }}
+				{{ common.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>
-				{{ _self.number('imcger_imgupload_max_width', IMCGER_MAX_WIDTH, 0, 99999) }} x {{ _self.number('imcger_imgupload_max_height', IMCGER_MAX_HEIGHT, 0, 99999) }}
+				{{ common.number('imcger_imgupload_max_width', IMCGER_MAX_WIDTH, 0, 99999) }} x {{ common.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>
+			<dt><label for="imcger_imgupload_max_filesize">{{ lang('ACP_IMCGER_FILESIZE_MAX') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_IMCGER_FILESIZE_MAX_DESC') }}</span></dt>
 			<dd>
-				{{ _self.number('imcger_imgupload_max_filesize', IMCGER_MAX_FILESIZE, 0, 9999999999) }} <select name="size_select"><option value="b" {% if IMCGER_UNIT == 'b' %} selected{% endif %}>Bytes</option><option value="kb" {% if IMCGER_UNIT == 'kb' %} selected{% endif %}>KiB</option><option value="mb" {% if IMCGER_UNIT == 'mb' %} selected{% endif %}>MiB</option></select>
+				{{ common.number('imcger_imgupload_max_filesize', IMCGER_FILESIZE_MAX, 0, 9999999999) }}
+				{% set units = {'BYTES': 'b', 'KIB': 'kb', 'MBI': 'mb', } %}
+				{{ common.select('unit_select', IMCGER_FILESIZE_UNIT, units) }}
 			</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, switch_type) }}
+				{{ common.switch('imcger_imgupload_del_exif', IMCGER_DEL_EXIF, switch_type) }}
 			</dd>
 		</dl>
 	</fieldset>
@@ -72,7 +88,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, switch_type) }}
+				{{ common.switch('imcger_imgupload_avatar_resize', IMCGER_AVATAR_RESIZE, switch_type) }}
 			</dd>
 		</dl>
 	</fieldset>
@@ -94,37 +110,3 @@ <h1>{{ lang('ACP_IMCGER_IMGUPLOAD_TITLE') }}</h1>
 </p>
 
 {% INCLUDE 'overall_footer.html' %}
-
-{% INCLUDECSS '@imcger_imgupload/acp_toggle.css' %}
-{% INCLUDECSS '@imcger_imgupload/acp_imgupload.css' %}
-{% INCLUDEJS '@imcger_imgupload/acp_imgupload.js' %}
-
-{#
-	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 %}

imcger/imgupload/composer.json

@@ -3,13 +3,12 @@
     "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.4.6",
-    "time": "2024-07-14",
+    "version": "1.5.0",
+    "time": "2025-06-16",
     "license": "GPL-2.0-only",
     "authors": [
         {
             "name": "Thorsten Ahlers",
-            "email": "",
             "homepage": "https://github.com/IMC-GER",
             "role": "Developer"
         },
@@ -19,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=7.4.0",
         "phpbb/phpbb": "^3.3.0",
         "composer/installers": "~1.0",
         "ext-imagick": "*"

imcger/imgupload/controller/admin_controller.php

@@ -10,39 +10,15 @@
 
 namespace imcger\imgupload\controller;
 
-/**
-* ACP Controller
-*/
 class admin_controller
 {
-	/** @var config */
-	protected $config;
-
-	/** @var template */
-	protected $template;
-
-	/** @var language */
-	protected $language;
-
-	/** @var request */
-	protected $request;
+	protected object $config;
+	protected object $template;
+	protected object $language;
+	protected object $request;
+	protected object $ext_manager;
+	protected string $u_action;
 
-	/** @var \phpbb\extension\manager */
-	protected $ext_manager;
-
-	/** @var string Custom form action */
-	protected $u_action;
-
-	/**
-	 * Constructor
-	 *
-	 * @param \phpbb\config\config		$config
-	 * @param \phpbb\template\template	$template
-	 * @param \phpbb\language\language	$language
-	 * @param \phpbb\request\request	$request
-	 * @param \phpbb\extension\manager	$ext_manager
-	 *
-	 */
 	public function __construct(
 		\phpbb\config\config $config,
 		\phpbb\template\template $template,
@@ -60,14 +36,10 @@ public function __construct(
 
 	/**
 	 * Display the options a user can configure for this extension
-	 *
-	 * @return null
-	 * @access public
 	 */
-	public function display_options()
+	public function display_options(): void
 	{
 		// Add ACP lang file
-		$this->language->add_lang('common', 'imcger/imgupload');
 		$this->language->add_lang('acp/attachments');
 
 		add_form_key('imcger/imgupload');
@@ -98,8 +70,8 @@ public function display_options()
 			'IMCGER_IMG_QUALITY'	=> $this->config['imcger_imgupload_img_quality'],
 			'IMCGER_MAX_WIDTH'		=> $this->config['imcger_imgupload_max_width'],
 			'IMCGER_MAX_HEIGHT'		=> $this->config['imcger_imgupload_max_height'],
-			'IMCGER_MAX_FILESIZE'	=> $filesize['value'],
-			'IMCGER_UNIT'			=> $filesize['si_identifier'],
+			'IMCGER_FILESIZE_MAX'	=> $filesize['value'],
+			'IMCGER_FILESIZE_UNIT'	=> $filesize['si_identifier'],
 			'IMCGER_DEL_EXIF'		=> (bool) $this->config['img_strip_metadata'],
 			'IMCGER_AVATAR_RESIZE'			=> (bool) $this->config['imcger_imgupload_avatar_resize'],
 			'IMCGER_AVATAR_FILESIZE_ISSET'	=> (bool) $this->config['avatar_filesize'],
@@ -111,15 +83,12 @@ public function display_options()
 
 	/**
 	 * Store the variable to the db
-	 *
-	 * @return null
-	 * @access protected
 	 */
-	protected function set_variable()
+	protected function set_variable(): void
 	{
-		$size_select  = $this->request->variable('size_select', 'b');
+		$unit_select  = $this->request->variable('unit_select', 'b');
 		$max_filesize = $this->request->variable('imcger_imgupload_max_filesize', 0);
-		$max_filesize = ($size_select == 'kb') ? round($max_filesize * 1024) : (($size_select == 'mb') ? round($max_filesize * 1048576) : $max_filesize);
+		$max_filesize = ($unit_select == 'kb') ? round($max_filesize * 1024) : (($unit_select == 'mb') ? round($max_filesize * 1048576) : $max_filesize);
 
 		$this->config->set('imcger_imgupload_tum_quality', $this->request->variable('imcger_imgupload_tum_quality', 80));
 		$this->config->set('imcger_imgupload_img_quality', $this->request->variable('imcger_imgupload_img_quality', 80));
@@ -135,12 +104,8 @@ protected function set_variable()
 
 	/**
 	 * Set page url
-	 *
-	 * @param string $u_action Custom form action
-	 * @return null
-	 * @access public
 	 */
-	public function set_page_url($u_action)
+	public function set_page_url(string $u_action): void
 	{
 		$this->u_action = $u_action;
 	}