Merge branch 'dev'

Author: IMC-GER

imcger/recenttopicsng/README.md

@@ -9,7 +9,7 @@ Based on NV Recent Topics for phpBB 3.0, by Joas Schilling ([nickvergessen](http
 
 ### Requirements
 * phpBB 3.3.5 - 3.3.x
-* PHP 7.1.3 - 8.4.x
+* PHP 7.4.0 - 8.4.x
 
 ### Supported Style
 * Prosilver

imcger/recenttopicsng/acp/acp_rtng_info.php

@@ -13,17 +13,9 @@
 
 namespace imcger\recenttopicsng\acp;
 
-/**
- * Class acp_rtng_info
- *
- * @package imcger\recenttopicsng\acp
- */
 class acp_rtng_info
 {
-	/**
-	 * @return array
-	 */
-	public function module()
+	public function module(): array
 	{
 		return [
 			'filename'	=> '\imcger\recenttopicsng\acp\acp_rtng_module',

imcger/recenttopicsng/acp/acp_rtng_module.php

@@ -13,46 +13,26 @@
 
 namespace imcger\recenttopicsng\acp;
 
-/**
- * Class acp_rtng_module
- *
- * @package imcger\recenttopicsng\acp
- */
 class acp_rtng_module
 {
-	public $page_title;
-	public $tpl_name;
-	public $u_action;
+	public string $page_title;
+	public string $tpl_name;
+	public string $u_action;
 
-	/**
-	 * @param $id
-	 * @param $mode
-	 * @throws \Exception
-	 *
-	 */
-	public function main($id, $mode)
+	public function main(string $id, string $mode): void
 	{
 		global $phpbb_container;
 
-		// Add ACP lang file
 		$language = $phpbb_container->get('language');
 
 		switch ($mode)
 		{
 			case 'settings':
-				// Get an instance of the admin controller
-				$admin_controller = $phpbb_container->get('imcger.recenttopicsng.admin.controller');
-
-				// Make the $u_action url available in the admin controller
-				$admin_controller->set_page_url($this->u_action);
-
-				// Load a template from adm/style for our ACP page
-				$this->tpl_name = 'acp_rtng';
-
-				// Set the page title for our ACP page
+				$this->tpl_name	  = 'acp_rtng';
 				$this->page_title = $language->lang('RTNG_NAME');
 
-				// Load the display options handle in the admin controller
+				$admin_controller = $phpbb_container->get('imcger.recenttopicsng.admin.controller');
+				$admin_controller->set_page_url($this->u_action);
 				$admin_controller->display_options();
 			break;
 		}

imcger/recenttopicsng/adm/style/acp_rtng.css

@@ -1,33 +1,32 @@
-/* ACP ConfirmBox (JS) */
+/* LukeWCSphpBBConfirmBox */
 
-div[id$="_confirmbox"] {
+div.lukewcs_confirmbox {
 	max-width: 450px;
 	border: 2px solid skyblue;
-	margin: .75em .5em;
-	padding: .25em .5em;
+	margin: 0.75em 0.5em;
+	padding: 0.25em 0.5em;
 	border-radius: 5px;
 	-webkit-box-shadow: 2px 2px 10px 1px rgba(121, 162, 179, 0.5);
 	box-shadow: 2px 2px 10px 1px rgba(121, 162, 179, 0.5);
 }
 
-div[id$="_confirmbox"] h2 {
-	margin: 0 0 .25em 0;
+div.lukewcs_confirmbox h2 {
+	margin: 0 0 0.25em 0;
 }
 
-div[id$="_confirmbox"] p:nth-of-type(2) {
+div.lukewcs_confirmbox p:last-of-type {
 	text-align: center;
 	margin: 0;
 	padding: 0 4px 4px 4px;
 }
 
-div[id$="_confirmbox"] input[type="button"] {
+div.lukewcs_confirmbox input[type="button"] {
 	padding: 3px 4px;
 }
 
-input[type="submit"]:disabled,
-input[type="button"]:disabled,
-input[class*="confirmbox_active"]:disabled {
-	opacity: .5;
+input:is([type="submit"], [type="button"]):disabled,
+input.lukewcs_confirmbox_active {
+	opacity: 0.5;
 	cursor: not-allowed;
 }
 

imcger/recenttopicsng/adm/style/acp_rtng.html

@@ -129,12 +129,12 @@ <h1>{{ lang('RTNG_NAME') }}</h1>
 {% INCLUDEJS '@imcger_recenttopicsng/acp_rtng.js' %}
 
 {% macro confirmbox(name, message, default = false) -%}
-	<div id="{{ name }}_confirmbox" data-default="{{ default }}" style="display: none;">
+	<div class="lukewcs_confirmbox" data-name="{{ name }}" data-default="{{ default }}" style="display: none;">
 		<h2>{{ lang('CONFIRM') }}</h2>
 		<p>{{ message }}</p>
 		<p>
-			<input type="button" class="button1" name="{{ name }}_confirm_yes" value="{{ lang('YES') }}">&nbsp;
-			<input type="button" class="button2" name="{{ name }}_confirm_no" value="{{ lang('NO') }}">
+			<input type="button" class="button1" name="lukewcs_confirmbox_yes" value="{{ lang('YES') }}">&nbsp;
+			<input type="button" class="button2" name="lukewcs_confirmbox_no" value="{{ lang('NO') }}">
 		</p>
 	</div>
 {%- endmacro %}

imcger/recenttopicsng/adm/style/acp_rtng.js

@@ -18,7 +18,7 @@ var RecentTopicsNG = {};
 
 class LukeWCSphpBBConfirmBox {
 /*
-* phpBB ConfirmBox class for checkboxes and yes/no radio buttons - v1.4.3
+* phpBB ConfirmBox class for checkboxes and yes/no radio buttons - v1.5.1
 * @copyright (c) 2023, LukeWCS, https://www.wcsaga.org
 * @license GNU General Public License, version 2 (GPL-2.0-only)
 */
@@ -28,31 +28,29 @@ class LukeWCSphpBBConfirmBox {
 		this.$formObject	= this.$submitObject.parents('form');
 		this.animDuration	= animDuration;
 
-		this.$formObject.find('div[id$="_confirmbox"]').each(function () {
-			const elementName = this.id.replace('_confirmbox', '');
-
-			$('input[name="' + elementName + '"]')				.on('change'	, _this.#Show);
-			$('input[name^="' + elementName + '_confirm_"]')	.on('click'		, _this.#Button);
+		this.$formObject.find('div.lukewcs_confirmbox').each(function () {
+			$('input[name="' + $(this).attr('data-name') + '"]').on('change', _this.#Show);
+			$(this).find('input[type="button"]')				.on('click'	, _this.#Button);
 		});
-		this.$formObject										.on('reset'		, _this.HideAll);
+		this.$formObject										.on('reset'	, _this.HideAll);
 	}
 
 	#Show = (e) => {
 		const $elementObject	= $('input[name="' + e.target.name + '"]');
-		const $confirmBoxObject	= $('div[id="' + e.target.name + '_confirmbox"]');
+		const $confirmBoxObject	= $('div.lukewcs_confirmbox[data-name="' + e.target.name + '"]');
 
 		if ($elementObject.prop('checked') != $confirmBoxObject.attr('data-default')) {
 			this.#changeBoxState($elementObject, $confirmBoxObject, true);
 		}
 	}
 
 	#Button = (e) => {
-		const elementName		= e.target.name.replace(/_confirm_.*/, '');
+		const elementName		= $(e.target).parents('div.lukewcs_confirmbox').attr('data-name');
 		const $elementObject	= $('input[name="' + elementName + '"]');
-		const $confirmBoxObject	= $('div[id="' + elementName + '_confirmbox"]');
+		const $confirmBoxObject	= $('div.lukewcs_confirmbox[data-name="' + elementName + '"]');
 		const elementType		= $elementObject.attr('type');
 
-		if (e.target.name.endsWith('_confirm_no')) {
+		if (e.target.name == 'lukewcs_confirmbox_no') {
 			if (elementType == 'checkbox') {
 				$elementObject.prop('checked', $confirmBoxObject.attr('data-default'));
 			} else if (elementType == 'radio') {
@@ -63,17 +61,17 @@ class LukeWCSphpBBConfirmBox {
 	}
 
 	HideAll = () => {
-		const $elementObject	= this.$formObject.find('input.confirmbox_active');
-		const $confirmBoxObject	= this.$formObject.find('div[id$="_confirmbox"]');
+		const $elementObject	= this.$formObject.find('input.lukewcs_confirmbox_active');
+		const $confirmBoxObject	= this.$formObject.find('div.lukewcs_confirmbox');
 
 		this.#changeBoxState($elementObject, $confirmBoxObject, false);
 	}
 
 	#changeBoxState = ($elementObject, $confirmBoxObject, showBox) => {
 		$elementObject		.prop('disabled', !!showBox);
-		$elementObject		.toggleClass('confirmbox_active', !!showBox);
+		$elementObject		.toggleClass('lukewcs_confirmbox_active', !!showBox);
 		$confirmBoxObject	[showBox ? 'show' : 'hide'](this.animDuration);
-		this.$submitObject	.prop('disabled', showBox ?? this.$formObject.find('input.confirmbox_active').length);
+		this.$submitObject	.prop('disabled', showBox ?? this.$formObject.find('input.lukewcs_confirmbox_active').length);
 	}
 }
 

imcger/recenttopicsng/composer.json

@@ -32,7 +32,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3,<8.5.0@dev",
+        "php": ">=7.4,<8.5.0@dev",
         "composer/installers": "~1.0"
     },
     "extra": {

imcger/recenttopicsng/controller/admin_controller.php

@@ -15,35 +15,16 @@
 
 class admin_controller
 {
-	/** @var \phpbb\config\config */
-	protected $config;
+	protected object $config;
+	protected object $template;
+	protected object $language;
+	protected object $request;
+	protected object $db;
+	protected object $ext_manager;
+	protected object $helper;
+	protected object $ctrl_common;
+	protected string $u_action;
 
-	/** @var \phpbb\template\template */
-	protected $template;
-
-	/** @var \phpbb\template\template */
-	protected $language;
-
-	/** @var \phpbb\request\request */
-	protected $request;
-
-	/** @var string Custom form action */
-	protected $u_action;
-
-	/** @var \phpbb\db\driver\driver_interface */
-	protected $db;
-
-	/** @var \phpbb\extension\manager */
-	protected $ext_manager;
-
-	/** @var \phpbb\controller\helper */
-	protected $helper;
-
-	protected $ctrl_common;
-
-	/**
-	 * Constructor
-	 */
 	public function __construct
 	(
 		\phpbb\config\config $config,
@@ -69,7 +50,7 @@ public function __construct
 	/**
 	 * Display the options a user can configure for this extension
 	 */
-	public function display_options()
+	public function display_options(): void
 	{
 		$this->language->add_lang(['viewforum', 'ucp']);
 
@@ -98,18 +79,16 @@ public function display_options()
 
 	/**
 	 * Set page url
-	 *
-	 * @param string $u_action Custom form action
 	 */
-	public function set_page_url($u_action)
+	public function set_page_url(string $u_action): void
 	{
 		$this->u_action = $u_action;
 	}
 
 	/**
 	 * Set template variables
 	 */
-	protected function set_template_vars()
+	protected function set_template_vars(): void
 	{
 		$metadata_manager = $this->ext_manager->create_extension_metadata_manager('imcger/recenttopicsng');
 
@@ -147,7 +126,7 @@ protected function set_template_vars()
 	/**
 	 * Store vars to config table
 	 */
-	protected function set_vars_config()
+	protected function set_vars_config(): void
 	{
 		$this->config->set('rtng_all_topics', $this->request->variable('rtng_all_topics', 0));
 		$this->config->set('rtng_min_topic_level', $this->request->variable('rtng_min_topic_level', 0));
@@ -172,10 +151,8 @@ protected function set_vars_config()
 
 	/**
 	 * Upate settings in user table
-	 *
-	 * @param  bool $all_user	Store data to all user when true
 	 */
-	protected function set_vars_usertable($all_user)
+	protected function set_vars_usertable(bool $all_user): void
 	{
 		$sql_ary = [
 			'user_rtng_enable'		 		 => (int) $this->request->variable('user_rtng_enable', 0),

imcger/recenttopicsng/controller/controller_common.php

@@ -13,21 +13,11 @@
 
 namespace imcger\recenttopicsng\controller;
 
-/**
- * Class controller_common
- *
- * @package imcger\recenttopicsng\controller
- */
 class controller_common
 {
-	/** @var \phpbb\user */
-	protected $user;
-
-	/** @var \phpbb\auth\auth */
-	protected $auth;
-
-	/** @var \phpbb\db\driver\driver_interface */
-	protected $db;
+	protected object $user;
+	protected object $auth;
+	protected object $db;
 
 	public function __construct
 	(
@@ -41,6 +31,12 @@ public function __construct
 		$this->db	= $db;
 	}
 
+	/*
+	 * Creates an array of variables for the SelectBox macro
+	 *
+	 * The variable $cfg_value is a union type array|string
+	 * Not specified for reasons of compatibility with php 7
+	 */
 	public function select_struct($cfg_value, array $options): array
 	{
 		$options_tpl = [];