1.0.2

Author: LukeWCS

.github/workflows/tests.yml

@@ -4,7 +4,7 @@ env:
     EXTNAME: lukewcs/limitreplies # Your extension vendor/package name
     SNIFF: 1            # Run code sniffer on your code? 1 or 0
     IMAGE_ICC: 1        # Run icc profile sniffer on your images? 1 or 0
-    EPV: 1              # Run EPV (Extension Pre Validator) on your code? 1 or 0
+    EPV: 0              # Run EPV (Extension Pre Validator) on your code? 1 or 0
     EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
     PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
 

README.md

@@ -5,5 +5,5 @@ Extension for phpBB - Forces a waiting period between two posts in a topic if th
 
 ### Requirements
 * phpBB 3.3.2 - 3.3.x
-* PHP 7.1.3 - 8.3.x
+* PHP 7.4.0 - 8.4.x
 

composer.json

@@ -3,8 +3,8 @@
 	"type": "phpbb-extension",
 	"description": "Forces a waiting period between two posts in a topic if the last post was from the same user. Posts in the topic’s moderation queue are also taken into account.",
 	"homepage": "https://github.com/LukeWCS/limit-multiple-replies",
-	"version": "1.0.1",
-	"time": "2024-07-06",
+	"version": "1.0.2",
+	"time": "2024-12-13",
 	"license": "GPL-2.0-only",
 	"authors": [
         {
@@ -14,7 +14,7 @@
 		}
 	],
 	"require": {
-		"php": ">=7.1.3,<8.4.0@dev",
+		"php": ">=7.4.0,<8.5.0@dev",
         "composer/installers": "~1.0.0"
 	},
 	"extra": {

controller/acp_limitreplies_controller.php

@@ -15,15 +15,14 @@
 
 class acp_limitreplies_controller
 {
-	protected $language;
-	protected $template;
-	protected $config;
-	protected $request;
-	protected $ext_manager;
+	protected object $language;
+	protected object $template;
+	protected object $config;
+	protected object $request;
+	protected object $ext_manager;
 
-	protected $u_action;
-
-	private $metadata;
+	protected string $u_action;
+	private   array  $metadata;
 
 	public function __construct(
 		\phpbb\language\language $language,
@@ -51,7 +50,10 @@ public function module_settings(): void
 
 		if ($this->request->is_set_post('submit'))
 		{
-			$this->check_form_key_error('lukewcs_limitreplies');
+			if (!check_form_key('lukewcs_limitreplies'))
+			{
+				trigger_error($this->language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
+			}
 
 			$this->config->set('limitreplies_switch_enable'		, $this->request->variable('limitreplies_switch_enable'		, 0));
 			$this->config->set('limitreplies_number_wait_time'	, $this->request->variable('limitreplies_number_wait_time'	, 60));
@@ -71,9 +73,9 @@ public function module_settings(): void
 
 			'LIMITREPLIES_SWITCH_ENABLE'			=> (bool) $this->config['limitreplies_switch_enable'],
 			'LIMITREPLIES_NUMBER_WAIT_TIME'			=> (int) $this->config['limitreplies_number_wait_time'],
-			'LIMITREPLIES_SELECT_HINT_MODE_OPTS'	=> $this->select_struct($this->config['limitreplies_select_hint_mode'], [
-				['LIMITREPLIES_HINT_MODE_ONCLICK'	, 1],
-				['LIMITREPLIES_HINT_MODE_ALWAYS'	, 2],
+			'LIMITREPLIES_SELECT_HINT_MODE_OPTS'	=> $this->select_struct((int) $this->config['limitreplies_select_hint_mode'], [
+				'LIMITREPLIES_HINT_MODE_ONCLICK'	=> 1,
+				'LIMITREPLIES_HINT_MODE_ALWAYS'		=> 2,
 			]),
 		]);
 
@@ -85,14 +87,6 @@ public function set_page_url($u_action): void
 		$this->u_action = $u_action;
 	}
 
-	private function check_form_key_error(string $key): void
-	{
-		if (!check_form_key($key))
-		{
-			trigger_error($this->language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-	}
-
 	private function set_meta_template_vars(string $tpl_prefix, string $copyright): void
 	{
 		$template_vars = [
@@ -110,12 +104,22 @@ private function set_meta_template_vars(string $tpl_prefix, string $copyright):
 		$this->template->assign_vars([$tpl_prefix . '_METADATA' => $template_vars]);
 	}
 
-	// Check the language pack version for the minimum version and generate notice if outdated
+	/*
+		Determine the version of the language pack with fallback to 0.0.0
+	*/
+	private function get_lang_ver(string $lang_ext_ver): string
+	{
+		preg_match('/^([0-9]+\.[0-9]+\.[0-9]+.*)/', $this->language->lang($lang_ext_ver), $matches);
+		return ($matches[1] ?? '0.0.0');
+	}
+
+	/*
+		Check the language pack version for the minimum version and generate notice if outdated
+	*/
 	private function lang_ver_check_msg(string $lang_version_var, string $lang_outdated_var): string
 	{
 		$lang_outdated_msg = '';
-		preg_match('/^([0-9]+\.[0-9]+\.[0-9]+)/', $this->language->lang($lang_version_var), $matches);
-		$ext_lang_ver = $matches[1] ?? '0.0.0';
+		$ext_lang_ver = $this->get_lang_ver($lang_version_var);
 		$ext_lang_min_ver = $this->metadata['extra']['lang-min-ver'];
 
 		if (phpbb_version_compare($ext_lang_ver, $ext_lang_min_ver, '<'))
@@ -124,8 +128,7 @@ private function lang_ver_check_msg(string $lang_version_var, string $lang_outda
 			{
 				$lang_outdated_msg = $this->language->lang($lang_outdated_var);
 			}
-			// Fallback if the current language package does not yet have the required variable.
-			else
+			else /* Fallback if the current language package does not yet have the required variable. */
 			{
 				$lang_outdated_msg = 'Note: The language pack for the extension <strong>%1$s</strong> is no longer up-to-date. (installed: %2$s / needed: %3$s)';
 			}
@@ -135,20 +138,24 @@ private function lang_ver_check_msg(string $lang_version_var, string $lang_outda
 		return $lang_outdated_msg;
 	}
 
-	private function select_struct($value, array $options_params): array
+	private function select_struct($cfg_value, array $options): array
 	{
-		$is_array_value = is_array($value);
-		$options = [];
-		foreach ($options_params as $params)
+		$options_tpl = [];
+
+		foreach ($options as $opt_key => $opt_value)
 		{
-			$options[] = [
-				'label'		=> $params[0],
-				'value'		=> $params[1],
-				'bold'		=> $params[2] ?? false,
-				'selected'	=> $is_array_value ? in_array($params[1], $value) : $params[1] == $value,
+			if (!is_array($opt_value))
+			{
+				$opt_value = [$opt_value];
+			}
+			$options_tpl[] = [
+				'label'		=> $opt_key,
+				'value'		=> $opt_value[0],
+				'bold'		=> $opt_value[1] ?? false,
+				'selected'	=> is_array($cfg_value) ? in_array($opt_value[0], $cfg_value) : $opt_value[0] == $cfg_value,
 			];
 		}
 
-		return $options;
+		return $options_tpl;
 	}
 }

docs/limit-multiple-replies_build_changelog.md

@@ -1,3 +1,16 @@
+### 1.0.2
+* Release (2024-12-13)
+* PHP:
+  * Code verwendet jetzt 7.4 Features.
+* ACP-Controller:
+  * Aktuelle Funktionen von EMP 3.0 übernommen:
+    * `select_struct()`
+	* `get_lang_ver()`
+	* `lang_ver_check_msg()`
+  * Code entsprechend angepasst.
+* ext.php`/`composer.json` angepasst:
+  * PHP: 7.1.3-8.3.x -> 7.4.0-8.4.x
+
 ### 1.0.1
 * Release (2024-07-06)
 * Gründer sind jetzt generell ausgeschlossen.

docs/limit-multiple-replies_changelog_de.md

@@ -1,3 +1,10 @@
+### 1.0.2
+(2024-12-13)
+
+* Die Voraussetzungen haben sich geändert:
+  * PHP: 7.4.0 - 8.4.x (Bisher: 7.1.3 - 8.3.x)
+* Technik auf den Stand von EMP 3.0 gebracht, Details im Build Changelog.
+
 ### 1.0.1
 (2024-07-06)
 

docs/version_check.json

@@ -1,7 +1,7 @@
 {
     "stable": {
         "3.3": {
-            "current": "1.0.1",
+            "current": "1.0.2",
             "announcement": "https://github.com/LukeWCS/limit-multiple-replies/releases",
             "eol": null,
             "security": false

event/listener.php

@@ -17,12 +17,12 @@
 
 class listener implements EventSubscriberInterface
 {
-	protected $language;
-	protected $template;
-	protected $config;
-	protected $auth;
-	protected $user;
-	protected $db;
+	protected object $language;
+	protected object $template;
+	protected object $config;
+	protected object $auth;
+	protected object $user;
+	protected object $db;
 
 	public function __construct(
 		\phpbb\language\language $language,
@@ -33,12 +33,12 @@ public function __construct(
 		\phpbb\db\driver\driver_interface $db
 	)
 	{
-		$this->language			= $language;
-		$this->template			= $template;
-		$this->config			= $config;
-		$this->auth				= $auth;
-		$this->user				= $user;
-		$this->db				= $db;
+		$this->language	= $language;
+		$this->template	= $template;
+		$this->config	= $config;
+		$this->auth		= $auth;
+		$this->user		= $user;
+		$this->db		= $db;
 	}
 
 	public static function getSubscribedEvents(): array
@@ -50,6 +50,9 @@ public static function getSubscribedEvents(): array
 		];
 	}
 
+	/*
+		EVENT: core.viewtopic_modify_page_title
+	*/
 	public function set_template_vars($event): void
 	{
 		if ($this->user->data['user_type'] != USER_NORMAL
@@ -73,6 +76,9 @@ public function set_template_vars($event): void
 		}
 	}
 
+	/*
+		EVENT: core.modify_posting_auth
+	*/
 	public function check_posting($event): void
 	{
 		if ($this->user->data['user_type'] != USER_NORMAL
@@ -93,6 +99,9 @@ public function check_posting($event): void
 		}
 	}
 
+	/*
+		EVENT: core.permissions
+	*/
 	public function add_permissions($event): void
 	{
 		$event->update_subarray('permissions', 'u_limitreplies_bypass_lock', ['lang' => 'ACL_U_LIMITREPLIES_BYPASS_LOCK', 'cat' => 'post']);
@@ -103,10 +112,10 @@ private function get_lock_time(array $topic_data): int
 		$wait_time			= $this->config['limitreplies_number_wait_time'] * 60;
 		$locked_until_time	= 0;
 
-		// Check whether there are posts in the queue of the topic.
+		/* Check whether there are posts in the queue of the topic. */
 		if ($topic_data['topic_posts_unapproved'])
 		{
-			// Get the data of the user's last post in the topic queue, if such a post exists.
+			/* Get the data of the user's last post in the topic queue, if such a post exists. */
 			$sql = 'SELECT post_id, post_time
 					FROM ' . POSTS_TABLE . '
 					WHERE topic_id = ' . (int) $topic_data['topic_id'] . '
@@ -117,14 +126,14 @@ private function get_lock_time(array $topic_data): int
 			$last_unapproved_post = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 
-			// Check if the timestamp of the user's last post in the queue is greater than the timestamp of the last visible post.
+			/* Check if the timestamp of the user's last post in the queue is greater than the timestamp of the last visible post. */
 			if ($last_unapproved_post !== false && $last_unapproved_post['post_time'] > $topic_data['topic_last_post_time'])
 			{
 				$locked_until_time = $last_unapproved_post['post_time'] + $wait_time;
 			}
 		}
 
-		// Check if the last visible post was from the same user.
+		/* Check if the last visible post was from the same user. */
 		if ($locked_until_time == 0 && $topic_data['topic_last_poster_id'] == $this->user->data['user_id'])
 		{
 			$locked_until_time = $topic_data['topic_last_post_time'] + $wait_time;

ext.php

@@ -18,7 +18,7 @@ class ext extends \phpbb\extension\base
 	public function is_enableable()
 	{
 		$valid_phpbb = phpbb_version_compare(PHPBB_VERSION, '3.3.2', '>=') && phpbb_version_compare(PHPBB_VERSION, '3.4.0-dev', '<');
-		$valid_php = phpbb_version_compare(PHP_VERSION, '7.1.3', '>=') && phpbb_version_compare(PHP_VERSION, '8.4.0-dev', '<');
+		$valid_php = phpbb_version_compare(PHP_VERSION, '7.4.0', '>=') && phpbb_version_compare(PHP_VERSION, '8.5.0-dev', '<');
 
 		return $valid_phpbb && $valid_php;
 	}