Merge b82d7d3f47 into bc470285fc

Merge pull request #6770 from rxu/ticket/15214
[ticket/15214] Add event & functionality for assigning template event priority
2025-07-26 11:58:53 +00:00 · 2025-06-15 00:05:55 -07:00 · 2025-06-15 08:59:31 +02:00 · 2025-06-15 01:35:31 +07:00 · 2025-06-01 09:45:57 -07:00 · 2025-06-01 08:30:11 -07:00
34 changed files with 5141 additions and 4280 deletions
--- a/.github/check-js.sh
+++ b/.github/check-js.sh
@ -14,6 +14,6 @@ set +x
 sudo npm install -g > /dev/null
 npm ci > /dev/null
 set -x
-node_modules/eslint/bin/eslint.js "phpBB/**/*.js"
-node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig"
+node_modules/eslint/bin/eslint.js "phpBB/**/*.js" --ignore-pattern "phpBB/ext/"
+node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig" --ignore-pattern "phpBB/ext/"
 node_modules/eslint/bin/eslint.js "gulpfile.js"
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@ -0,0 +1,67 @@
+const { browser: browserGlobals, node: nodeGlobals, jquery: jqueryGlobals } = (await import('globals')).default;
+
+// File patterns to ignore
+const IGNORED_FILES = [
+	'phpBB/assets/javascript/cropper.js',
+	'phpBB/assets/javascript/hermite.js',
+	'phpBB/assets/javascript/jquery-cropper.js',
+	'phpBB/**/*.min.js',
+	'phpBB/vendor/**/*.js',
+	'phpBB/vendor-ext/**/*.js',
+	'phpBB/phpbb/**/*.js',
+	'phpBB/tests/**/*.js',
+];
+
+// ESLint rule configurations
+const FORMATTING_RULES = {
+	'quotes': ['error', 'single'],
+	'comma-dangle': ['error', 'always-multiline'],
+	'block-spacing': 'error',
+	'array-bracket-spacing': ['error', 'always'],
+	'object-curly-spacing': ['error', 'always'],
+	'space-before-function-paren': ['error', 'never'],
+	'space-in-parens': 'off',
+};
+
+const CODE_QUALITY_RULES = {
+	'semi': ['error', 'always'],
+	'eqeqeq': ['error', 'always'],
+	'curly': ['error', 'multi-line'],
+	'no-var': 'error',
+	'prefer-const': 'error',
+	'no-console': 'off',
+	'no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
+};
+
+const DISABLED_STYLE_RULES = {
+	'multiline-comment-style': 'off',
+	'computed-property-spacing': 'off',
+	'capitalized-comments': 'off',
+	'no-lonely-if': 'off',
+};
+
+const mainConfig = {
+	files: ['**/*.js', '**/*.js.twig'],
+	linterOptions: {
+		reportUnusedDisableDirectives: false,
+	},
+	languageOptions: {
+		ecmaVersion: 'latest',
+		sourceType: 'module',
+		globals: {
+			...browserGlobals,
+			...nodeGlobals,
+			...jqueryGlobals,
+		},
+	},
+	rules: {
+		...FORMATTING_RULES,
+		...CODE_QUALITY_RULES,
+		...DISABLED_STYLE_RULES,
+	},
+};
+
+export default [
+	{ ignores: IGNORED_FILES },
+	mainConfig,
+];
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -6,65 +6,6 @@
 	"directories": {
 		"doc": "docs"
 	},
-	"eslintConfig": {
-		"extends": "xo",
-		"ignorePatterns": [
-			"phpBB/adm/style/admin.js",
-			"phpBB/adm/style/ajax.js",
-			"phpBB/adm/style/permissions.js",
-			"phpBB/adm/style/tooltip.js",
-			"phpBB/assets/javascript/core.js",
-			"phpBB/assets/javascript/cropper.js",
-			"phpBB/assets/javascript/editor.js",
-			"phpBB/assets/javascript/hermite.js",
-			"phpBB/assets/javascript/installer.js",
-			"phpBB/assets/javascript/jquery-cropper.js",
-			"phpBB/assets/javascript/plupload.js",
-			"phpBB/ext/**/*.js",
-			"phpBB/styles/prosilver/template/ajax.js",
-			"phpBB/styles/prosilver/template/forum_fn.js",
-			"phpBB/**/*.min.js",
-			"phpBB/vendor/**/*.js",
-			"phpBB/vendor-ext/**/*.js",
-			"phpBB/phpbb/**/*.js",
-			"phpBB/tests/**/*.js"
-		],
-		"rules": {
-			"quotes": [
-				"error",
-				"single"
-			],
-			"comma-dangle": [
-				"error",
-				"always-multiline"
-			],
-			"block-spacing": "error",
-			"array-bracket-spacing": [
-				"error",
-				"always"
-			],
-			"multiline-comment-style": "off",
-			"computed-property-spacing": "off",
-			"space-before-function-paren": [
-				"error",
-				"never"
-			],
-			"space-in-parens": "off",
-			"capitalized-comments": "off",
-			"object-curly-spacing": [
-				"error",
-				"always"
-			],
-			"no-lonely-if": "off",
-			"unicorn/prefer-module": "off"
-		},
-		"env": {
-			"es6": true,
-			"browser": true,
-			"node": true,
-			"jquery": true
-		}
-	},
 	"browserslist": [
 		"> 1%",
 		"not ie 11",
@ -101,8 +42,8 @@
 	"devDependencies": {
 		"autoprefixer": "^10.4.4",
 		"cssnano": "^5.1.7",
-		"eslint": "^8.13.0",
-		"eslint-config-xo": "^0.40.0",
+		"eslint": "^9.28.0",
+		"globals": "^16.2.0",
 		"gulp": "^5.0.0",
 		"gulp-concat": "^2.6.1",
 		"gulp-postcss": "^9.0.1",
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@ -1,4 +1,5 @@
 /* global phpbb */
+/* eslint no-var: 0 */

 /**
 * phpBB ACP functions
@ -7,19 +8,16 @@
 /**
 * Parse document block
 */
-function parse_document(container)
-{
-	var test = document.createElement('div'),
-		oldBrowser = (typeof test.style.borderRadius == 'undefined');
-
+function parseDocument(container) {
+	var test = document.createElement('div');
 	test.remove();

 	/**
 	* Navigation
 	*/
 	container.find('#menu').each(function() {
-		var menu = $(this),
-			blocks = menu.children('.menu-block');
+		var menu = $(this);
+		var blocks = menu.children('.menu-block');

 		if (!blocks.length) {
 			return;
@ -31,6 +29,7 @@ function parse_document(container)
 			if (!parent.hasClass('active')) {
 				parent.siblings().removeClass('active');
 			}
+
 			parent.toggleClass('active');
 		});

@ -47,12 +46,11 @@ function parse_document(container)
 	* Responsive tables
 	*/
 	container.find('table').not('.not-responsive').each(function() {
-		var $this = $(this),
-			th = $this.find('thead > tr > th'),
-			columns = th.length,
-			headers = [],
-			totalHeaders = 0,
-			i, headersLength;
+		var $this = $(this);
+		var th = $this.find('thead > tr > th');
+		var headers = [];
+		var totalHeaders = 0;
+		var i;

 		// Find columns
 		$this.find('colgroup:first').children().each(function(i) {
@ -71,21 +69,24 @@ function parse_document(container)
 		}

 		// Find each header
-		if (!$this.data('no-responsive-header'))
-		{
+		if (!$this.data('no-responsive-header')) {
 			th.each(function(column) {
-				var cell = $(this),
-					colspan = parseInt(cell.attr('colspan')),
-					dfn = cell.attr('data-dfn'),
-					text = dfn ? dfn : $.trim(cell.text());
+				var cell = $(this);
+				var colspan = parseInt(cell.attr('colspan'), 10);
+				var dfn = cell.attr('data-dfn');
+				var text = dfn ? dfn : $.trim(cell.text());
+
+				if (text === '&nbsp;') {
+					text = '';
+				}

-				if (text == '&nbsp;') text = '';
 				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;

-				for (i=0; i<colspan; i++) {
+				for (i = 0; i < colspan; i++) {
 					headers.push(text);
 				}
-				totalHeaders ++;
+
+				totalHeaders++;

 				if (dfn && !column) {
 					$this.addClass('show-header');
@ -104,19 +105,19 @@ function parse_document(container)
 		}

 		$this.find('tbody > tr').each(function() {
-			var row = $(this),
-				cells = row.children('td'),
-				column = 0;
+			var row = $(this);
+			var cells = row.children('td');
+			var column = 0;

-			if (cells.length == 1) {
+			if (cells.length === 1) {
 				row.addClass('big-column');
 				return;
 			}

 			cells.each(function() {
-				var cell = $(this),
-					colspan = parseInt(cell.attr('colspan')),
-					text = $.trim(cell.text());
+				var cell = $(this);
+				var colspan = parseInt(cell.attr('colspan'), 10);
+				var text = $.trim(cell.text());

 				if (headersLength <= column) {
 					return;
@ -124,10 +125,9 @@ function parse_document(container)

 				if ((text.length && text !== '-') || cell.children().length) {
 					if (headers[column].length) {
-						cell.prepend($("<dfn>").css('display', 'none').text(headers[column]));
+						cell.prepend($('<dfn>').css('display', 'none').text(headers[column]));
 					}
-				}
-				else {
+				} else {
 					cell.addClass('empty');
 				}

@ -145,8 +145,7 @@ function parse_document(container)
 	*/
 	container.find('table.responsive > tbody').each(function() {
 		var items = $(this).children('tr');
-		if (!items.length)
-		{
+		if (!items.length) {
 			$(this).parent('table:first').addClass('responsive-hide');
 		}
 	});
@ -156,7 +155,7 @@ function parse_document(container)
 	*/
 	container.find('fieldset dt > span:last-child').each(function() {
 		var $this = $(this);
-		if ($this.html() == '&nbsp;') {
+		if ($this.html() === '&nbsp;') {
 			$this.addClass('responsive-hide');
 		}
 	});
@ -180,25 +179,25 @@ function parse_document(container)
 	* Responsive tabs
 	*/
 	container.find('#tabs').not('[data-skip-responsive]').each(function() {
-		var $this = $(this),
-			$body = $('body'),
-			ul = $this.children(),
-			tabs = ul.children().not('[data-skip-responsive]'),
-			links = tabs.children('a'),
-			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
-			menu = item.find('.dropdown-contents'),
-			maxHeight = 0,
-			lastWidth = false,
-			responsive = false;
+		var $this = $(this);
+		var $body = $('body');
+		var ul = $this.children();
+		var tabs = ul.children().not('[data-skip-responsive]');
+		var links = tabs.children('a');
+		var item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab');
+		var menu = item.find('.dropdown-contents');
+		var maxHeight = 0;
+		var lastWidth = false;
+		var responsive = false;

 		links.each(function() {
 			var link = $(this);
 			maxHeight = Math.max(maxHeight, Math.max(link.outerHeight(true), link.parent().outerHeight(true)));
-		})
+		});

 		function check() {
-			var width = $body.width(),
-				height = $this.height();
+			var width = $body.width();
+			var height = $this.height();

 			if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) {
 				return;
@ -214,6 +213,7 @@ function parse_document(container)
 				if (item.hasClass('dropdown-visible')) {
 					phpbb.toggleDropdown.call(item.find('a.responsive-tab-link').get(0));
 				}
+
 				return;
 			}

@ -221,23 +221,29 @@ function parse_document(container)
 			item.show();
 			menu.html('');

-			var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)'),
-				total = availableTabs.length,
-				i, tab;
+			var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)');
+			var total = availableTabs.length;
+			var i;
+			var tab;

-			for (i = total - 1; i >= 0; i --) {
+			for (i = total - 1; i >= 0; i--) {
 				tab = availableTabs.eq(i);
 				menu.prepend(tab.clone(true).removeClass('tab'));
 				tab.hide();
 				if ($this.height() <= maxHeight) {
-					menu.find('a').click(function() { check(true); });
+					menu.find('a').click(() => {
+						check(true);
+					});
 					return;
 				}
 			}
-			menu.find('a').click(function() { check(true); });
+
+			menu.find('a').click(() => {
+				check(true);
+			});
 		}

-		phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), {visibleClass: 'activetab', verticalDirection: 'down'});
+		phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), { visibleClass: 'activetab', verticalDirection: 'down' });

 		check(true);
 		$(window).resize(check);
@ -248,7 +254,7 @@ function parse_document(container)
 * Run onload functions
 */
 (function($) {
-	$(document).ready(function() {
+	$(document).ready(() => {
 		// Swap .nojs and .hasjs
 		$('body.nojs').toggleClass('nojs hasjs');

@ -257,12 +263,12 @@ function parse_document(container)
 			$('#' + this.getAttribute('data-focus')).focus();
 		});

-		parse_document($('body'));
+		parseDocument($('body'));

 		$('#questionnaire-form').css('display', 'none');
 		var $triggerConfiglist = $('#trigger-configlist');

-		$triggerConfiglist.on('click', function () {
+		$triggerConfiglist.on('click', function() {
 			var $configlist = $('#configlist');
 			$configlist.closest('.send-stats-data-row').toggleClass('send-stats-data-hidden');
 			$configlist.closest('.send-stats-row').find('.send-stats-data-row:first-child').toggleClass('send-stats-data-only-row');
@ -272,8 +278,8 @@ function parse_document(container)
 		$('#configlist').closest('.send-stats-data-row').addClass('send-stats-data-hidden');

 		// Do not underline actions icons on hover (could not be done via CSS)
-		$('.actions a:has(i.acp-icon)').mouseover(function () {
-			$(this).css("text-decoration", "none");
+		$('.actions a:has(i.acp-icon)').mouseover(function() {
+			$(this).css('text-decoration', 'none');
 		});

 		// Live update BBCode font icon preview
@ -296,11 +302,11 @@ function parse_document(container)
 		const pageIconFont = document.getElementById('bbcode_font_icon');

 		if (pageIconFont) {
-			pageIconFont.addEventListener('keyup', function () {
+			pageIconFont.addEventListener('keyup', function() {
 				updateIconClass(this.nextElementSibling, this.value);
 			});

-			pageIconFont.addEventListener('blur', function () {
+			pageIconFont.addEventListener('blur', function() {
 				updateIconClass(this.nextElementSibling, this.value);
 			});
 		}
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@ -1,29 +1,27 @@
 /* global phpbb, statsData */
+/* eslint no-var: 0 */

 (function($) { // Avoid conflicts with other libraries
+	'use strict';

-'use strict';
-
-
-phpbb.prepareSendStats = function () {
+	phpbb.prepareSendStats = function() {
 		var $form = $('#acp_help_phpbb');
 		var $dark = $('#darkenwrapper');
 		var $loadingIndicator;

-	$form.on('submit', function (event) {
-		var $this = $(this),
-			currentTime = Math.floor(new Date().getTime() / 1000),
-			statsTime = parseInt($this.find('input[name=help_send_statistics_time]').val(), 10);
+		$form.on('submit', function(event) {
+			var $this = $(this);
+			var currentTime = Math.floor(new Date().getTime() / 1000);
+			var statsTime = parseInt($this.find('input[name=help_send_statistics_time]').val(), 10);

 			event.preventDefault();
 			$this.unbind('submit');

 			// Skip ajax request if form is submitted too early or send stats
 			// checkbox is not checked
-		if (!$this.find('input[name=help_send_statistics]').is(':checked') ||
-			statsTime > currentTime) {
+			if (!$this.find('input[name=help_send_statistics]').is(':checked') || statsTime > currentTime) {
 				$form.find('input[type=submit]').click();
-			setTimeout(function () {
+				setTimeout(() => {
 					$form.find('input[type=submit]').click();
 				}, 300);
 				return;
@ -36,6 +34,7 @@ phpbb.prepareSendStats = function () {
 				if (typeof console !== 'undefined' && console.log) {
 					console.log('AJAX error. status: ' + textStatus + ', message: ' + errorThrown);
 				}
+
 				phpbb.clearLoadingTimeout();
 				var errorText = '';

@ -47,6 +46,7 @@ phpbb.prepareSendStats = function () {
 						errorText = $dark.attr('data-ajax-error-text');
 					}
 				}
+
 				phpbb.alert($dark.attr('data-ajax-error-title'), errorText);
 			}

@ -74,7 +74,7 @@ phpbb.prepareSendStats = function () {
 				var $sendStatisticsSuccess = $('<input />', {
 					type: 'hidden',
 					name: 'send_statistics_response',
-				value: JSON.stringify(res)
+					value: JSON.stringify(res),
 				});
 				$sendStatisticsSuccess.appendTo('p.submit-buttons');

@ -90,78 +90,77 @@ phpbb.prepareSendStats = function () {
 				data: statsData,
 				success: returnHandler,
 				error: errorHandler,
-			cache: false
-		}).always(function() {
+				cache: false,
+			}).always(() => {
 				if ($loadingIndicator && $loadingIndicator.is(':visible')) {
 					$loadingIndicator.fadeOut(phpbb.alertTime);
 				}
 			});
 		});
-};
+	};

-/**
+	/**
 	* The following callbacks are for reording items. row_down
 	* is triggered when an item is moved down, and row_up is triggered when
 	* an item is moved up. It moves the row up or down, and deactivates /
 	* activates any up / down icons that require it (the ones at the top or bottom).
 	*/
-phpbb.addAjaxCallback('row_down', function(res) {
+	phpbb.addAjaxCallback('row_down', function(res) {
 		if (typeof res.success === 'undefined' || !res.success) {
 			return;
 		}

-	var $firstTr = $(this).parents('tr'),
-		$secondTr = $firstTr.next();
+		var $firstTr = $(this).parents('tr');
+		var $secondTr = $firstTr.next();

 		$firstTr.insertAfter($secondTr);
-});
+	});

-phpbb.addAjaxCallback('row_up', function(res) {
+	phpbb.addAjaxCallback('row_up', function(res) {
 		if (typeof res.success === 'undefined' || !res.success) {
 			return;
 		}

-	var $secondTr = $(this).parents('tr'),
-		$firstTr = $secondTr.prev();
+		var $secondTr = $(this).parents('tr');
+		var $firstTr = $secondTr.prev();

 		$secondTr.insertBefore($firstTr);
-});
+	});

-/**
+	/**
 	* This callback replaces activate links with deactivate links and vice versa.
 	* It does this by replacing the text, and replacing all instances of "activate"
 	* in the href with "deactivate", and vice versa.
 	*/
-phpbb.addAjaxCallback('activate_deactivate', function(res) {
-	var $this = $(this),
-		newHref = $this.attr('href');
+	phpbb.addAjaxCallback('activate_deactivate', function(res) {
+		var $this = $(this);
+		var newHref = $this.attr('href');

 		$this.text(res.text);

-	if (newHref.indexOf('deactivate') !== -1) {
-		newHref = newHref.replace('deactivate', 'activate');
-	} else {
+		if (newHref.indexOf('deactivate') === -1) {
 			newHref = newHref.replace('activate', 'deactivate');
+		} else {
+			newHref = newHref.replace('deactivate', 'activate');
 		}

 		$this.attr('href', newHref);
-});
+	});

-/**
+	/**
 	* The removes the parent row of the link or form that triggered the callback,
 	* and is good for stuff like the removal of forums.
 	*/
-phpbb.addAjaxCallback('row_delete', function(res) {
+	phpbb.addAjaxCallback('row_delete', function(res) {
 		if (res.SUCCESS !== false) {
 			$(this).parents('tr').remove();
 		}
-});
+	});

-/**
+	/**
 	* This callback generates the VAPID keys for the web push notification service.
 	*/
-phpbb.addAjaxCallback('generate_vapid_keys', () => {
-
+	phpbb.addAjaxCallback('generate_vapid_keys', () => {
 		/**
 		 * Generate VAPID keypair with public and private key string
 		 *
@ -176,7 +175,7 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
 						namedCurve: 'P-256',
 					},
 					true,
-				['deriveKey', 'deriveBits']
+					[ 'deriveKey', 'deriveBits' ],
 				);

 				const privateKeyJwk = await crypto.subtle.exportKey('jwk', keyPair.privateKey);
@ -187,7 +186,7 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {

 				return {
 					privateKey: privateKeyString,
-				publicKey: publicKeyString
+					publicKey: publicKeyString,
 				};
 			} catch (error) {
 				console.error('Error generating keys with SubtleCrypto:', error);
@ -199,38 +198,38 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
 			if (!keyPair) {
 				return;
 			}
+
 			const publicKeyInput = document.querySelector('#webpush_vapid_public');
 			const privateKeyInput = document.querySelector('#webpush_vapid_private');
 			publicKeyInput.value = keyPair.publicKey;
 			privateKeyInput.value = keyPair.privateKey;
-	})
-})
+		});
+	});

-/**
+	/**
 	* Handler for submitting permissions form in chunks
 	* This call will submit permissions forms in chunks of 5 fieldsets.
 	*/
-function submitPermissions() {
-	var $form = $('form#set-permissions'),
-		fieldsetList = $form.find('fieldset[id^=perm]'),
-		formDataSets = [],
-		dataSetIndex = 0,
-		$submitAllButton = $form.find('input[type=submit][name^=action]')[0],
-		$submitButton = $form.find('input[type=submit][data-clicked=true]')[0];
+	function submitPermissions() {
+		var $form = $('form#set-permissions');
+		var fieldsetList = $form.find('fieldset[id^=perm]');
+		var formDataSets = [];
+		var dataSetIndex = 0;
+		var $submitAllButton = $form.find('input[type=submit][name^=action]')[0];
+		var $submitButton = $form.find('input[type=submit][data-clicked=true]')[0];

 		// Set proper start values for handling refresh of page
-	var permissionSubmitSize = 0,
-		permissionRequestCount = 0,
-		forumIds = [],
-		permissionSubmitFailed = false,
-		clearIndicator = true,
-		$loadingIndicator;
+		var permissionSubmitSize = 0;
+		var permissionRequestCount = 0;
+		var forumIds = [];
+		var permissionSubmitFailed = false;
+		var clearIndicator = true;

 		if ($submitAllButton !== $submitButton) {
 			fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id);
 		}

-	$.each(fieldsetList, function (key, value) {
+		$.each(fieldsetList, (key, value) => {
 			dataSetIndex = Math.floor(key / 5);
 			var $fieldset = $('fieldset#' + value.id);
 			if (key % 5 === 0) {
@ -244,21 +243,21 @@ function submitPermissions() {
 			if (roleInput.val()) {
 				formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' + roleInput.val();
 			} else {
-			formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' +
-				$fieldset.find('select[name="' + roleInput.attr('name') + '"]').val();
+				formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '='
+				+ $fieldset.find('select[name="' + roleInput.attr('name') + '"]').val();
 			}
 		});

 		permissionSubmitSize = formDataSets.length;

 		// Add each forum ID to forum ID list to preserve selected forums
-	$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
+		$.each($form.find('input[type=hidden][name^=forum_id]'), (key, value) => {
 			if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
 				forumIds.push(value.value);
 			}
 		});

-	$loadingIndicator = phpbb.loadingIndicator();
+		var $loadingIndicator = phpbb.loadingIndicator();

 		/**
 		 * Handler for submitted permissions form chunk
@ -286,18 +285,18 @@ function submitPermissions() {
 						$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/g, ''));
 						const $previousPageForm = $('<form>').attr({
 							action: $alertBoxLink.attr('href'),
-						method: 'post'
+							method: 'post',
 						});

-					$.each(forumIds, function (key, value) {
+						$.each(forumIds, (key, value) => {
 							$previousPageForm.append($('<input>').attr({
 								type: 'text',
 								name: 'forum_id[]',
-							value: value
+								value,
 							}));
 						});

-					$alertBoxLink.on('click', function (e) {
+						$alertBoxLink.on('click', e => {
 							$('body').append($previousPageForm);
 							e.preventDefault();
 							$previousPageForm.submit();
@ -309,19 +308,19 @@ function submitPermissions() {
 					$alert.find('.alert_close').hide();

 					if (typeof res.REFRESH_DATA !== 'undefined') {
-					setTimeout(function () {
+						setTimeout(() => {
 							// Create forum to submit using POST. This will prevent
 							// exceeding the maximum length of URLs
 							const $form = $('<form>').attr({
 								action: res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, ''),
-							method: 'post'
+								method: 'post',
 							});

-						$.each(forumIds, function (key, value) {
+							$.each(forumIds, (key, value) => {
 								$form.append($('<input>').attr({
 									type: 'text',
 									name: 'forum_id[]',
-								value: value
+									value,
 								}));
 							});

@ -329,7 +328,7 @@ function submitPermissions() {

 							// Hide the alert even if we refresh the page, in case the user
 							// presses the back button.
-						$dark.fadeOut(phpbb.alertTime, function () {
+							$dark.fadeOut(phpbb.alertTime, () => {
 								if (typeof $alert !== 'undefined') {
 									$alert.hide();
 								}
@ -355,44 +354,44 @@ function submitPermissions() {
 		}

 		// Create AJAX request for each form data set
-	$.each(formDataSets, function (key, formData) {
+		$.each(formDataSets, (key, formData) => {
 			$.ajax({
 				url: $form.action,
 				type: 'POST',
-			data: formData + '&' + $submitButton.name + '=' + encodeURIComponent($submitButton.value) +
-				'&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value +
-				'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value +
-				'&' + $form.children('input[type=hidden]').serialize() +
-				'&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
+				data: formData + '&' + $submitButton.name + '=' + encodeURIComponent($submitButton.value)
+				+ '&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value
+				+ '&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value
+				+ '&' + $form.children('input[type=hidden]').serialize()
+				+ '&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
 				success: handlePermissionReturn,
-			error: handlePermissionReturn
+				error: handlePermissionReturn,
 			});
 		});
-}
+	}

-$('[data-ajax]').each(function() {
-	var $this = $(this),
-		ajax = $this.attr('data-ajax');
+	$('[data-ajax]').each(function() {
+		var $this = $(this);
+		var ajax = $this.attr('data-ajax');

 		if (ajax !== 'false') {
-		var fn = (ajax !== 'true') ? ajax : null;
+			var fn = (ajax === 'true') ? null : ajax;
 			phpbb.ajaxify({
 				selector: this,
 				refresh: $this.attr('data-refresh') !== undefined,
-			callback: fn
+				callback: fn,
 			});
 		}
-});
+	});

-/**
-* Automatically resize textarea
-*/
-$(function() {
-	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
+	/**
+	* Automatically resize textarea
+	*/
+	$(() => {
+		phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), { minHeight: 75 });

 		var $setPermissionsForm = $('form#set-permissions');
 		if ($setPermissionsForm.length) {
-		$setPermissionsForm.on('submit', function (e) {
+			$setPermissionsForm.on('submit', e => {
 				submitPermissions();
 				e.preventDefault();
 			});
@ -412,13 +411,11 @@ $(function() {
 				} else {
 					dateoptionInput.value = this.value;
 				}
-		})
+			});
 		}

 		if ($('#acp_help_phpbb')) {
 			phpbb.prepareSendStats();
 		}
-});
-
-
+	});
 })(jQuery); // Avoid conflicts with other libraries
--- a/phpBB/adm/style/permissions.js
+++ b/phpBB/adm/style/permissions.js
@ -1,4 +1,8 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-undef: 0 */
+/* eslint no-unused-vars: 0 */
+/* eslint no-var: 0 */

 /**
 * Hide and show all checkboxes
@ -9,12 +13,11 @@ function display_checkboxes(status) {
 	var cb = document.getElementsByTagName('input');
 	var display;

-	//show
 	if (status) {
+		// show
 		display = 'inline';
-	}
-	//hide
-	else {
+	} else {
+		// hide
 		display = 'none';
 	}

@ -31,10 +34,10 @@ function display_checkboxes(status) {
 * value = 0 (hidden) till 10 (fully visible)
 */
 function set_opacity(e, value) {
-	e.style.opacity = value/10;
+	e.style.opacity = value / 10;

-	//IE opacity currently turned off, because of its astronomical stupidity
-	//e.style.filter = 'alpha(opacity=' + value*10 + ')';
+	// IE opacity currently turned off, because of its astronomical stupidity
+	// e.style.filter = 'alpha(opacity=' + value*10 + ')';
 }

 /**
@ -72,11 +75,11 @@ function reset_opacity(status, except_id) {
 		}
 	}

-	if (typeof(except_id) !== 'undefined') {
+	if (typeof (except_id) !== 'undefined') {
 		set_opacity(document.getElementById('perm' + except_id), 10);
 	}

-	//reset checkboxes too
+	// reset checkboxes too
 	marklist('set-permissions', 'inherit', !status);
 }

@ -86,13 +89,14 @@ function reset_opacity(status, except_id) {
 * rb = array of radiobuttons
 */
 function get_radio_status(index, rb) {
-	for (var i = index; i < rb.length; i = i + 3 ) {
+	for (var i = index; i < rb.length; i += 3 ) {
 		if (rb[i].checked !== true) {
 			if (i > index) {
-				//at least one is true, but not all (custom)
+				// at least one is true, but not all (custom)
 				return 2;
 			}
-			//first one is not true
+
+			// first one is not true
 			return 0;
 		}
 	}
@ -111,7 +115,7 @@ function set_colours(id, init, quick) {
 	var table = document.getElementById('table' + id);
 	var tab = document.getElementById('tab' + id);

-	if (typeof(quick) !== 'undefined') {
+	if (typeof (quick) !== 'undefined') {
 		tab.className = 'permissions-preset-' + quick + ' activetab';
 		return;
 	}
@ -161,7 +165,7 @@ function init_colours(block_id) {
 		}
 	}

-	tab.className = tab.className + ' activetab';
+	tab.className += ' activetab';
 }

 /**
@ -170,6 +174,7 @@ function init_colours(block_id) {
 * adv = we are opening advanced permissions
 * view = called from view permissions
 */
+// eslint-disable-next-line max-params
 function swap_options(pmask, fmask, cat, adv, view) {
 	id = pmask + fmask + cat;
 	active_option = active_pmask + active_fmask + active_cat;
@ -196,14 +201,14 @@ function swap_options(pmask, fmask, cat, adv, view) {
 		display_checkboxes(true);
 		reset_opacity(1);
 	} else if (adv) {
-		//Checkbox might have been clicked, but we need full visibility
+		// Checkbox might have been clicked, but we need full visibility
 		display_checkboxes(true);
 		reset_opacity(1);
 	}

 	// set active tab
-	old_tab.className = old_tab.className.replace(/\ activetab/g, '');
-	new_tab.className = new_tab.className + ' activetab';
+	old_tab.className = old_tab.className.replace(/ activetab/g, '');
+	new_tab.className += ' activetab';

 	if (id === active_option && adv !== true) {
 		return;
@ -211,7 +216,7 @@ function swap_options(pmask, fmask, cat, adv, view) {

 	phpbb.toggleDisplay('options' + active_option, -1);

-	//hiding and showing the checkbox
+	// hiding and showing the checkbox
 	if (document.getElementById('checkbox' + active_pmask + active_fmask)) {
 		phpbb.toggleDisplay('checkbox' + pmask + fmask, -1);

@ -227,6 +232,7 @@ function swap_options(pmask, fmask, cat, adv, view) {
 	if (!view) {
 		phpbb.toggleDisplay('advanced' + pmask + fmask, 1);
 	}
+
 	phpbb.toggleDisplay('options' + id, 1);

 	active_pmask = pmask;
@ -248,7 +254,7 @@ function mark_options(id, s) {
 	var rb = t.getElementsByTagName('input');

 	for (var r = 0; r < rb.length; r++) {
-		if (rb[r].id.substr(rb[r].id.length-1) === s) {
+		if (rb[r].id.substr(rb[r].id.length - 1) === s) {
 			rb[r].checked = true;
 		}
 	}
@ -264,7 +270,7 @@ function mark_one_option(id, field_name, s) {
 	var rb = t.getElementsByTagName('input');

 	for (var r = 0; r < rb.length; r++) {
-		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) === field_name && rb[r].id.substr(rb[r].id.length-1) === s) {
+		if (rb[r].id.substr(rb[r].id.length - field_name.length - 3, field_name.length) === field_name && rb[r].id.substr(rb[r].id.length - 1) === s) {
 			rb[r].checked = true;
 		}
 	}
@ -287,10 +293,10 @@ function reset_role(id) {
 	}

 	// Before resetting the role dropdown, try and match any permission role
-	var parent = t.parentNode,
-		roleId = match_role_settings(id.replace('role', 'perm')),
-		text = no_role_assigned,
-		index = 0;
+	var parent = t.parentNode;
+	var roleId = match_role_settings(id.replace('role', 'perm'));
+	var text = no_role_assigned;
+	var index = 0;

 	// If a role permissions was matched, grab that option's value and index
 	if (roleId) {
@ -326,8 +332,10 @@ function set_role_settings(role_id, target_id) {
 	mark_options(target_id, 'u');

 	for (var r in settings) {
+		if (Object.prototype.hasOwnProperty.call(settings, r)) {
 			mark_one_option(target_id, r, (settings[r] === 1) ? 'y' : 'n');
 		}
+	}
 }

 /**
@ -337,9 +345,9 @@ function set_role_settings(role_id, target_id) {
 * @return {number}			The permission role identifier
 */
 function match_role_settings(id) {
-	var fieldset = document.getElementById(id),
-		radios = fieldset.getElementsByTagName('input'),
-		set = {};
+	var fieldset = document.getElementById(id);
+	var radios = fieldset.getElementsByTagName('input');
+	var set = {};

 	// Iterate over all the radio buttons
 	for (var i = 0; i < radios.length; i++) {
@ -355,8 +363,7 @@ function match_role_settings(id) {
 	set = sort_and_stringify(set);

 	// Iterate over the available role options and return the first match
-	for (var r in role_options)
-	{
+	for (var r in role_options) {
 		if (sort_and_stringify(role_options[r]) === set) {
 			return parseInt(r, 10);
 		}
@ -372,7 +379,7 @@ function match_role_settings(id) {
 * @return {string}			The sorted object as a string
 */
 function sort_and_stringify(obj) {
-	return JSON.stringify(Object.keys(obj).sort().reduce(function (result, key) {
+	return JSON.stringify(Object.keys(obj).sort().reduce((result, key) => {
 		result[key] = obj[key];
 		return result;
 	}, {}));
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@ -1,4 +1,5 @@
 /* global phpbb */
+/* eslint no-var: 0 */

 /*
 javascript for Bubble Tooltips by Alessandro Fulciniti
@ -13,36 +14,35 @@ phpBB Development Team:
 */

 (function($) { // Avoid conflicts with other libraries
+	'use strict';

-'use strict';
+	var tooltips = [];

-var tooltips = [];
-
-/**
+	/**
 	* Enable tooltip replacements for selects
 	* @param {string} id ID tag of select
 	* @param {string} headline Text that should appear on top of tooltip
 	* @param {string} [subId] Sub ID that should only be using tooltips (optional)
-*/
-phpbb.enableTooltipsSelect = function (id, headline, subId) {
-	var $links, hold;
+	*/
+	phpbb.enableTooltipsSelect = function(id, headline, subId) {
+		var $links;

-	hold = $('<span />', {
+		var hold = $('<span />', {
 			id:	'_tooltip_container',
 			css: {
-			position: 'absolute'
-		}
+				position: 'absolute',
+			},
 		});

 		$('body').append(hold);

-	if (!id) {
-		$links = $('.roles-options li');
-	} else {
+		if (id) {
 			$links = $('.roles-options li', '#' + id);
+		} else {
+			$links = $('.roles-options li');
 		}

-	$links.each(function () {
+		$links.each(function() {
 			var $this = $(this);

 			if (subId) {
@ -53,44 +53,42 @@ phpbb.enableTooltipsSelect = function (id, headline, subId) {
 				phpbb.prepareTooltips($this, headline);
 			}
 		});
-};
+	};

-/**
+	/**
 	* Prepare elements to replace
 	*
 	* @param {jQuery} $element Element to prepare for tooltips
 	* @param {string} headText Text heading to display
-*/
-phpbb.prepareTooltips = function ($element, headText) {
-	var $tooltip, text, $desc, $title;
-
-	text = $element.attr('data-title');
+	*/
+	phpbb.prepareTooltips = function($element, headText) {
+		var text = $element.attr('data-title');

 		if (text === null || text.length === 0) {
 			return;
 		}

-	$title = $('<span />', {
+		var $title = $('<span />', {
 			class: 'top',
 			css: {
-			display:	'block'
-		}
+				display:	'block',
+			},
 		})
 			.append(document.createTextNode(headText));

-	$desc = $('<span />', {
+		var $desc = $('<span />', {
 			class: 'bottom',
 			html: text,
 			css: {
-			display: 'block'
-		}
+				display: 'block',
+			},
 		});

-	$tooltip = $('<span />', {
+		var $tooltip = $('<span />', {
 			class: 'tooltip',
 			css: {
-			display: 'block'
-		}
+				display: 'block',
+			},
 		})
 			.append($title)
 			.append($desc);
@ -98,63 +96,61 @@ phpbb.prepareTooltips = function ($element, headText) {
 		tooltips[$element.attr('data-id')] = $tooltip;
 		$element.on('mouseover', phpbb.showTooltip);
 		$element.on('mouseout', phpbb.hideTooltip);
-};
+	};

-/**
+	/**
 	* Show tooltip
 	*
 	* @param {object} $element Element passed by .on()
-*/
-phpbb.showTooltip = function ($element) {
+	*/
+	phpbb.showTooltip = function($element) {
 		var $this = $($element.target);
 		$('#_tooltip_container').append(tooltips[$this.attr('data-id')]);
 		phpbb.positionTooltip($this);
-};
+	};

-/**
+	/**
 	* Hide tooltip
-*/
-phpbb.hideTooltip = function () {
+	*/
+	phpbb.hideTooltip = function() {
 		var d = document.getElementById('_tooltip_container');
 		if (d.childNodes.length > 0) {
 			d.removeChild(d.firstChild);
 		}
-};
+	};

-/**
+	/**
 	* Correct positioning of tooltip container
 	*
 	* @param {jQuery} $element Tooltip element that should be positioned
-*/
-phpbb.positionTooltip = function ($element) {
-	var offset;
-
+	*/
+	phpbb.positionTooltip = function($element) {
 		$element = $element.parent();
-	offset = $element.offset();
+		var offset = $element.offset();

 		if ($('body').hasClass('rtl')) {
 			$('#_tooltip_container').css({
 				top: offset.top + 30,
-			left: offset.left + 255
+				left: offset.left + 255,
 			});
 		} else {
 			$('#_tooltip_container').css({
 				top: offset.top + 30,
-			left: offset.left - 205
+				left: offset.left - 205,
 			});
 		}
-};
+	};

-/**
+	/**
 	* Prepare roles drop down select
 	*/
-phpbb.prepareRolesDropdown = function () {
+	phpbb.prepareRolesDropdown = function() {
 		var $options = $('.roles-options li');

 		// Display span and hide select
 		$('.roles-options > span').css('display', 'block');
 		$('.roles-options > select').hide();
-	$('.roles-options > input[type=hidden]').each(function () {
+		$('.roles-options > input[type=hidden]').each(function() {
 			var $this = $(this);

 			if ($this.attr('data-name') && !$this.attr('name')) {
@ -163,7 +159,7 @@ phpbb.prepareRolesDropdown = function () {
 		});

 		// Prepare highlighting of select options and settings update
-	$options.each(function () {
+		$options.each(function() {
 			var $this = $(this);
 			var $rolesOptions = $this.closest('.roles-options');
 			var $span = $rolesOptions.children('span');
@ -182,23 +178,25 @@ phpbb.prepareRolesDropdown = function () {
 				}

 				// Prepare resetting drop down on form reset
-			$this.closest('form').on('reset', function () {
+				$this.closest('form').on('reset', () => {
 					$span.text($span.attr('data-default'));
 					$rolesOptions.children('input[type=hidden]')
 						.val($span.attr('data-default-val'));
 				});
 			}

-		$this.on('mouseover', function () {
+			$this.on('mouseover', function() {
 				var $this = $(this);
 				$options.removeClass('roles-highlight');
 				$this.addClass('roles-highlight');
-		}).on('click', function () {
+			}).on('click', function() {
 				var $this = $(this);
 				var $rolesOptions = $this.closest('.roles-options');

 				// Update settings
+				// eslint-disable-next-line no-undef
 				set_role_settings($this.attr('data-id'), $this.attr('data-target-id'));
+				// eslint-disable-next-line no-undef
 				init_colours($this.attr('data-target-id').replace('advanced', ''));

 				// Set selected setting
@ -211,15 +209,14 @@ phpbb.prepareRolesDropdown = function () {
 				$('body').trigger('click');
 			});
 		});
-};
+	};

-// Run onload functions for RolesDropdown and tooltips
-$(function() {
+	// Run onload functions for RolesDropdown and tooltips
+	$(() => {
 		// Enable tooltips
 		phpbb.enableTooltipsSelect('set-permissions', $('#set-permissions').attr('data-role-description'), 'role');

 		// Prepare dropdown
 		phpbb.prepareRolesDropdown();
-});
-
+	});
 })(jQuery); // Avoid conflicts with other libraries
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@ -1,4 +1,11 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-undef: 0 */
+/* eslint no-unused-vars: 0 */
+/* eslint no-var: 0 */
+
+var form_name = 'postform';
+var text_name = 'message';

 /**
 * bbCode control by subBlue design [ www.subBlue.com ]
@ -34,7 +41,7 @@ function initInsertions() {

 	var textarea = doc.forms[form_name].elements[text_name];

-	if (is_ie && typeof(baseHeight) !== 'number') {
+	if (is_ie && typeof (baseHeight) !== 'number') {
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;

@ -48,11 +55,11 @@ function initInsertions() {
 * bbstyle
 */
 function bbstyle(bbnumber) {
-	if (bbnumber !== -1) {
-		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} else {
+	if (bbnumber === -1) {
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();
+	} else {
+		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber + 1]);
 	}
 }

@ -84,7 +91,7 @@ function bbfontstyle(bbopen, bbclose) {
 		return;
 	}

-	//The new position for the cursor after adding the bbcode
+	// The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
 	var new_pos = caret_pos + bbopen.length;

@ -96,11 +103,10 @@ function bbfontstyle(bbopen, bbclose) {
 	if (!isNaN(textarea.selectionStart)) {
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}
+	} else if (document.selection) {
 		// IE
-	else if (document.selection) {
 		var range = textarea.createTextRange();
-		range.move("character", new_pos);
+		range.move('character', new_pos);
 		range.select();
 		storeCaret(textarea);
 	}
@ -114,10 +120,10 @@ function bbfontstyle(bbopen, bbclose) {
 function insert_text(text, spaces, popup) {
 	var textarea;

-	if (!popup) {
-		textarea = document.forms[form_name].elements[text_name];
-	} else {
+	if (popup) {
 		textarea = opener.document.forms[form_name].elements[text_name];
+	} else {
+		textarea = document.forms[form_name].elements[text_name];
 	}

 	if (spaces) {
@ -142,7 +148,7 @@ function insert_text(text, spaces, popup) {
 		var caret_pos = textarea.caretPos;
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
 	} else {
-		textarea.value = textarea.value + text;
+		textarea.value += text;
 	}

 	if (!popup) {
@ -171,6 +177,7 @@ function addquote(post_id, username, l_wrote, attributes) {
 		// Backwards compatibility
 		l_wrote = 'wrote';
 	}
+
 	if (typeof attributes !== 'object') {
 		attributes = {};
 	}
@ -195,10 +202,10 @@ function addquote(post_id, username, l_wrote, attributes) {
 		if (divarea.innerHTML) {
 			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
 			theSelection = theSelection.replace(/<br\/>/ig, '\n');
-			theSelection = theSelection.replace(/&lt\;/ig, '<');
-			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');
-			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
+			theSelection = theSelection.replace(/&lt;/ig, '<');
+			theSelection = theSelection.replace(/&gt;/ig, '>');
+			theSelection = theSelection.replace(/&amp;/ig, '&');
+			theSelection = theSelection.replace(/&nbsp;/ig, ' ');
 		} else if (document.all) {
 			theSelection = divarea.innerText;
 		} else if (divarea.textContent) {
@ -213,7 +220,7 @@ function addquote(post_id, username, l_wrote, attributes) {
 			attributes.author = username;
 			insert_text(generateQuote(theSelection, attributes));
 		} else {
-			insert_text(username + ' ' + l_wrote + ':' + '\n');
+			insert_text(username + ' ' + l_wrote + ':\n');
 			var lines = split_lines(theSelection);
 			for (i = 0; i < lines.length; i++) {
 				insert_text('> ' + lines[i] + '\n');
@ -243,12 +250,14 @@ function generateQuote(text, attributes) {
 		quote += '=' + formatAttributeValue(attributes.author);
 		delete attributes.author;
 	}
+
 	for (var name in attributes) {
-		if (attributes.hasOwnProperty(name)) {
+		if (Object.hasOwn(attributes, name)) {
 			var value = attributes[name];
 			quote += ' ' + name + '=' + formatAttributeValue(value.toString());
 		}
 	}
+
 	quote += ']';
 	var newline = ((quote + text + '[/quote]').length > 80 || text.indexOf('\n') > -1) ? '\n' : '';
 	quote += newline + text + newline + '[/quote]';
@ -271,19 +280,20 @@ function formatAttributeValue(str) {
 		// Return as-is if it contains none of: space, ' " \ or ]
 		return str;
 	}
-	var singleQuoted = "'" + str.replace(/[\\']/g, '\\$&') + "'",
-		doubleQuoted = '"' + str.replace(/[\\"]/g, '\\$&') + '"';
+
+	var singleQuoted = '\'' + str.replace(/[\\']/g, '\\$&') + '\'';
+	var doubleQuoted = '"' + str.replace(/[\\"]/g, '\\$&') + '"';

 	return (singleQuoted.length < doubleQuoted.length) ? singleQuoted : doubleQuoted;
 }

 function split_lines(text) {
 	var lines = text.split('\n');
-	var splitLines = new Array();
+	var splitLines = [];
 	var j = 0;
 	var i;

-	for(i = 0; i < lines.length; i++) {
+	for (i = 0; i < lines.length; i++) {
 		if (lines[i].length <= 80) {
 			splitLines[j] = lines[i];
 			j++;
@ -302,9 +312,10 @@ function split_lines(text) {
 					j++;
 				}
 			}
-			while(splitAt !== -1);
+			while (splitAt !== -1);
 		}
 	}
+
 	return splitLines;
 }

@ -312,12 +323,12 @@ function split_lines(text) {
 * From http://www.massless.org/mozedit/
 */
 function mozWrap(txtarea, open, close) {
-	var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
+	var selLength = (typeof (txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
 	var selStart = txtarea.selectionStart;
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;

-	var s1 = (txtarea.value).substring(0,selStart);
+	var s1 = (txtarea.value).substring(0, selStart);
 	var s2 = (txtarea.value).substring(selStart, selEnd);
 	var s3 = (txtarea.value).substring(selEnd, selLength);

@ -326,8 +337,6 @@ function mozWrap(txtarea, open, close) {
 	txtarea.selectionEnd = selEnd + open.length;
 	txtarea.focus();
 	txtarea.scrollTop = scrollTop;
-
-	return;
 }

 /**
@ -358,9 +367,8 @@ function getCaretPosition(txtarea) {
 	if (txtarea.selectionStart || txtarea.selectionStart === 0) {
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
-	}
+	} else if (document.selection) {
 		// dirty and slow IE way
-	else if (document.selection) {
 		// get current selection
 		var range = document.selection.createRange();

@ -404,7 +412,7 @@ function getCaretPosition(txtarea) {
 			phpbb.showDragNDrop(textarea);
 		}

-		$('textarea').on('keydown', function (e) {
+		$('textarea').on('keydown', function(e) {
 			if (e.which === 13 && (e.metaKey || e.ctrlKey)) {
 				$(this).closest('form').find(':submit').click();
 			}
--- a/phpBB/assets/javascript/installer.js
+++ b/phpBB/assets/javascript/installer.js
@ -2,6 +2,9 @@
 * Installer's AJAX frontend handler
 */

+/* eslint no-prototype-builtins: 0 */
+/* eslint no-var: 0 */
+
 (function($) { // Avoid conflicts with other libraries
 	'use strict';

@ -46,7 +49,10 @@
 		var $warningContainer = $('#warning-container');
 		var $logContainer = $('#log-container');

-		var $title, $description, $msgElement, arraySize = messages.length;
+		var $title;
+		var $description;
+		var $msgElement;
+		var arraySize = messages.length;
 		for (var i = 0; i < arraySize; i++) {
 			$msgElement = $('<div />');
 			$title = $('<strong />');
@ -59,24 +65,19 @@
 				$msgElement.append($description);
 			}

-			switch (type) {
-				case 'error':
+			if (type === 'error') {
 				$msgElement.addClass('errorbox');
 				$errorContainer.append($msgElement);
-					break;
-				case 'warning':
+			} else if (type === 'warning') {
 				$msgElement.addClass('warningbox');
 				$warningContainer.append($msgElement);
-					break;
-				case 'log':
+			} else if (type === 'log') {
 				$msgElement.addClass('log');
 				$logContainer.prepend($msgElement);
 				$logContainer.addClass('show_log_container');
-					break;
-				case 'success':
+			} else if (type === 'success') {
 				$msgElement.addClass('successbox');
 				$errorContainer.prepend($msgElement);
-					break;
 			}
 		}
 	}
@ -84,10 +85,12 @@
 	/**
 	 * Render a download box
 	 */
-	function addDownloadBox(downloadArray)
-	{
+	function addDownloadBox(downloadArray) {
 		var $downloadContainer = $('#download-wrapper');
-		var $downloadBox, $title, $content, $link;
+		var $downloadBox;
+		var $title;
+		var $content;
+		var $link;

 		for (var i = 0; i < downloadArray.length; i++) {
 			$downloadBox = $('<div />');
@ -116,8 +119,7 @@
 	/**
 	 * Render update files' status
 	 */
-	function addUpdateFileStatus(fileStatus)
-	{
+	function addUpdateFileStatus(fileStatus) {
 		var $statusContainer = $('#file-status-wrapper');
 		$statusContainer.html(fileStatus);
 	}
@ -140,8 +142,10 @@
 	 * @param navObj
 	 */
 	function updateNavbarStatus(navObj) {
-		var navID, $stage, $stageListItem, $active;
-		$active = $('#activemenu');
+		var navID;
+		var $stage;
+		var $stageListItem;
+		var $active = $('#activemenu');

 		if (navObj.hasOwnProperty('finished')) {
 			// This should be an Array
@ -179,7 +183,11 @@
 	 * @param progressObject
 	 */
 	function setProgress(progressObject) {
-		var $statusText, $progressBar, $progressText, $progressFiller, $progressFillerText;
+		var $statusText;
+		var $progressBar;
+		var $progressText;
+		var $progressFiller;
+		var $progressFillerText;

 		if (progressObject.task_name.length) {
 			if (!progressBarTriggered) {
@ -246,8 +254,8 @@
 	}

 	// Redirects user
-	function redirect(url, use_ajax) {
-		if (use_ajax) {
+	function redirect(url, useAjax) {
+		if (useAjax) {
 			resetPolling();

 			var xhReq = createXhrObject();
@ -276,6 +284,7 @@
 			if (window.console) {
 				console.log('Failed to parse JSON object\n\nMessage: ' + err.message + '\n\nServer Response: ' + messageJSON);
 			} else {
+				// eslint-disable-next-line no-alert
 				alert('Failed to parse JSON object\n\nMessage: ' + err.message + '\n\nServer Response: ' + messageJSON);
 			}

@ -358,12 +367,14 @@
 			setTimeout(queryInstallerStatus, 5000);
 		} else {
 			$('#loading_indicator').css('display', 'none');
-			addMessage('error',
-				[{
+			addMessage('error', [
+				{
+					// eslint-disable-next-line no-undef
 					title: installLang.title,
-					description: installLang.msg
-				}]
-			);
+					// eslint-disable-next-line no-undef
+					description: installLang.msg,
+				},
+			]);
 		}
 	}

@ -385,7 +396,7 @@
 		}

 		url = url.substring(0, position) + lookUp + '/installer/status';
-		$.getJSON(url, function(data) {
+		$.getJSON(url, data => {
 			processTimeoutResponse(data.status);
 		});
 	}
@ -398,7 +409,10 @@
 	function pollContent(xhReq) {
 		var messages = xhReq.responseText;
 		var msgSeparator = '}\n\n';
-		var unprocessed, messageEndIndex, endOfMessageIndex, message;
+		var unprocessed;
+		var messageEndIndex;
+		var endOfMessageIndex;
+		var message;

 		do {
 			unprocessed = messages.substring(nextReadPosition);
@ -466,7 +480,7 @@
 		currentProgress = Math.floor(progressStart);

 		clearInterval(progressTimer);
-		progressTimer = setInterval(function() {
+		progressTimer = setInterval(() => {
 			incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit);
 		}, 10);
 	}
@ -487,7 +501,7 @@
 	function startPolling(xhReq) {
 		resetPolling();
 		transmissionOver = false;
-		pollTimer = setInterval(function () {
+		pollTimer = setInterval(() => {
 			pollContent(xhReq);
 		}, 250);
 	}
@ -605,11 +619,13 @@
 	function interceptFormSubmit($form) {
 		if (!$form.length) {
 			return;
-		} else if ($form.find('input[name="admin_name"]').length > 0) {
+		}
+
+		if ($form.find('input[name="admin_name"]').length > 0) {
 			setAdminTimezone($form);
 		}

-		$form.find(':submit').bind('click', function (event) {
+		$form.find(':submit').bind('click', function(event) {
 			event.preventDefault();
 			submitForm($form, $(this));
 		});
@ -623,7 +639,8 @@
 	function setAdminTimezone($form) {
 		// Set admin timezone if it does not exist yet
 		if ($form.find('input[name="admin_timezone"]').length === 0) {
-			const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+			// eslint-disable-next-line new-cap
+			const { timeZone } = Intl.DateTimeFormat().resolvedOptions();

 			// Add timezone as form entry
 			const timezoneEntry = $('<input type="hidden" name="admin_timezone" value="' + timeZone + '">');
--- a/phpBB/assets/javascript/plupload.js
+++ b/phpBB/assets/javascript/plupload.js
@ -1,16 +1,17 @@
-/* global phpbb, plupload, attachInline */
+/* global phpbb, plupload, attachInline, activateSubPanel */
+/* eslint camelcase: 0 */
+/* eslint no-var: 0 */

 plupload.addI18n(phpbb.plupload.i18n);
 phpbb.plupload.ids = [];

 (function($) { // Avoid conflicts with other libraries
+	'use strict';

-'use strict';
-
-/**
+	/**
 	* Set up the uploader.
 	*/
-phpbb.plupload.initialize = function() {
+	phpbb.plupload.initialize = function() {
 	// Initialize the Plupload uploader.
 		phpbb.plupload.uploader.init();

@ -19,9 +20,9 @@ phpbb.plupload.initialize = function() {
 		phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData());

 		// Only execute if Plupload initialized successfully.
-	phpbb.plupload.uploader.bind('Init', function() {
+		phpbb.plupload.uploader.bind('Init', () => {
 			phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0];
-		let $attachRowTemplate = $('#attach-row-tpl');
+			const $attachRowTemplate = $('#attach-row-tpl');
 			$attachRowTemplate.removeClass('attach-row-tpl');
 			phpbb.plupload.rowTpl = $attachRowTemplate[0].outerHTML;

@ -31,7 +32,7 @@ phpbb.plupload.initialize = function() {
 			$('#attach-panel-multi').show();
 		});

-	phpbb.plupload.uploader.bind('PostInit', function() {
+		phpbb.plupload.uploader.bind('PostInit', () => {
 		// Point out the drag-and-drop zone if it's supported.
 			if (phpbb.plupload.uploader.features.dragdrop) {
 				$('#drag-n-drop-message').show();
@ -41,49 +42,50 @@ phpbb.plupload.initialize = function() {
 			if ($('#attach-panel-multi').is(':visible')) {
 				phpbb.plupload.uploader.refresh();
 			}
-		$('[data-subpanel="attach-panel"]').one('click', function() {
+
+			$('[data-subpanel="attach-panel"]').one('click', () => {
 				phpbb.plupload.uploader.refresh();
 			});
 		});
-};
+	};

-/**
+	/**
 	* Unsets all elements in the object uploader.settings.multipart_params whose keys
 	* begin with 'attachment_data['
 	*/
-phpbb.plupload.clearParams = function() {
+	phpbb.plupload.clearParams = function() {
 		var obj = phpbb.plupload.uploader.settings.multipart_params;
 		for (var key in obj) {
-		if (!obj.hasOwnProperty(key) || key.indexOf('attachment_data[') !== 0) {
+			if (!Object.prototype.hasOwnProperty.call(obj, key) || key.indexOf('attachment_data[') !== 0) {
 				continue;
 			}

 			delete phpbb.plupload.uploader.settings.multipart_params[key];
 		}
-};
+	};

-/**
+	/**
 	* Update uploader.settings.multipart_params object with new data.
 	*
 	* @param {object} obj
 	*/
-phpbb.plupload.updateMultipartParams = function(obj) {
-	var settings = phpbb.plupload.uploader.settings;
+	phpbb.plupload.updateMultipartParams = function(obj) {
+		var { settings } = phpbb.plupload.uploader;
 		settings.multipart_params = $.extend(settings.multipart_params, obj);
-};
+	};

-/**
+	/**
 	* Convert the array of attachment objects into an object that PHP would expect as POST data.
 	*
 	* @returns {object} An object in the form 'attachment_data[i][key]': value as
 	* 	expected by the server
 	*/
-phpbb.plupload.getSerializedData = function() {
+	phpbb.plupload.getSerializedData = function() {
 		var obj = {};
 		for (var i = 0; i < phpbb.plupload.data.length; i++) {
 			var datum = phpbb.plupload.data[i];
 			for (var key in datum) {
-			if (!datum.hasOwnProperty(key)) {
+				if (!Object.prototype.hasOwnProperty.call(datum, key)) {
 					continue;
 				}

@ -97,37 +99,38 @@ phpbb.plupload.getSerializedData = function() {
 		obj.form_token = $pluploadForm.find('input[type=hidden][name="form_token"]').val();

 		return obj;
-};
+	};

-/**
+	/**
 	* Get the index from the phpbb.plupload.data array where the given
 	* attachment id appears.
 	*
 	* @param {int} attachId The attachment id of the file.
 	* @returns {bool|int} Index of the file if exists, otherwise false.
 	*/
-phpbb.plupload.getIndex = function(attachId) {
+	phpbb.plupload.getIndex = function(attachId) {
 		var index = $.inArray(Number(attachId), phpbb.plupload.ids);
-	return (index !== -1) ? index : false;
-};
+		return index === -1 ? false : index;
+	};

-/**
+	/**
 	* Set the data in phpbb.plupload.data and phpbb.plupload.ids arrays.
 	*
 	* @param {Array} data	Array containing the new data to use. In the form of
 	* array(index => object(property: value). Requires attach_id to be one of the object properties.
 	*/
-phpbb.plupload.setData = function(data) {
+	phpbb.plupload.setData = function(data) {
 	// Make sure that the array keys are reset.
-	phpbb.plupload.ids = phpbb.plupload.data = [];
+		phpbb.plupload.ids = [];
+		phpbb.plupload.data = [];
 		phpbb.plupload.data = data;

 		for (var i = 0; i < data.length; i++) {
 			phpbb.plupload.ids.push(Number(data[i].attach_id));
 		}
-};
+	};

-/**
+	/**
 	* Update the attachment data in the HTML and the phpbb & phpbb.plupload objects.
 	*
 	* @param {Array} data			Array containing the new data to use.
@ -135,27 +138,26 @@ phpbb.plupload.setData = function(data) {
 	* @param {int} index			The index from phpbb.plupload_ids that was affected by the action.
 	* @param {Array} downloadUrl	Optional array of download urls to update.
 	*/
-phpbb.plupload.update = function(data, action, index, downloadUrl) {
-
+	phpbb.plupload.update = function(data, action, index, downloadUrl) {
 		phpbb.plupload.updateBbcode(action, index);
 		phpbb.plupload.setData(data);
 		phpbb.plupload.updateRows(downloadUrl);
 		phpbb.plupload.clearParams();
 		phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData());
-};
+	};

-/**
+	/**
 	* Update the relevant elements and hidden data for all attachments.
 	*
 	* @param {Array} downloadUrl Optional array of download urls to update.
 	*/
-phpbb.plupload.updateRows = function(downloadUrl) {
+	phpbb.plupload.updateRows = function(downloadUrl) {
 		for (var i = 0; i < phpbb.plupload.ids.length; i++) {
 			phpbb.plupload.updateRow(i, downloadUrl);
 		}
-};
+	};

-/**
+	/**
 	* Insert a row for a new attachment. This expects an HTML snippet in the HTML
 	* using the id "attach-row-tpl" to be present. This snippet is cloned and the
 	* data for the file inserted into it. The row is then appended or prepended to
@ -163,7 +165,7 @@ phpbb.plupload.updateRows = function(downloadUrl) {
 	*
 	* @param {object} file Plupload file object for the new attachment.
 	*/
-phpbb.plupload.insertRow = function(file) {
+	phpbb.plupload.insertRow = function(file) {
 		var row = $(phpbb.plupload.rowTpl);

 		row.attr('id', file.id);
@ -175,22 +177,22 @@ phpbb.plupload.insertRow = function(file) {
 		} else {
 			$('#file-list').append(row);
 		}
-};
+	};

-/**
+	/**
 	* 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.
 	*/
-phpbb.plupload.updateRow = function(index, downloadUrl) {
-	var attach = phpbb.plupload.data[index],
-		row = $('[data-attach-id="' + attach.attach_id + '"]');
+	phpbb.plupload.updateRow = function(index, downloadUrl) {
+		var attach = phpbb.plupload.data[index];
+		var row = $('[data-attach-id="' + attach.attach_id + '"]');

 		// Add the link to the file
 		if (typeof downloadUrl !== 'undefined' && typeof downloadUrl[index] !== 'undefined') {
-		var url = downloadUrl[index].replace('&amp;', '&'),
-			link = $('<a></a>');
+			var url = downloadUrl[index].replace('&amp;', '&');
+			var link = $('<a></a>');

 			link.attr('href', url).html(attach.real_filename);
 			row.find('.file-name').html(link);
@ -198,21 +200,21 @@ phpbb.plupload.updateRow = function(index, downloadUrl) {

 		row.find('textarea').attr('name', 'comment_list[' + index + ']');
 		phpbb.plupload.updateHiddenData(row, attach, index);
-};
+	};

-/**
+	/**
 	* Update hidden input data for an attachment.
 	*
 	* @param {object} row		jQuery object for the attachment row.
 	* @param {object} attach	Attachment data object from phpbb.plupload.data
 	* @param {int} index		Attachment index from phpbb.plupload.ids
 	*/
-phpbb.plupload.updateHiddenData = function(row, attach, index) {
+	phpbb.plupload.updateHiddenData = function(row, attach, index) {
 		row.find('input[type="hidden"]').remove();

 		for (var key in attach) {
-		if (!attach.hasOwnProperty(key)) {
-			return;
+			if (!Object.prototype.hasOwnProperty.call(attach, key)) {
+				continue;
 			}

 			var input = $('<input />')
@ -221,9 +223,9 @@ phpbb.plupload.updateHiddenData = function(row, attach, index) {
 				.attr('value', attach[key]);
 			$(row).append(input);
 		}
-};
+	};

-/**
+	/**
 	* Deleting a file removes it from the queue and fires an AJAX event to the
 	* server to tell it to remove the temporary attachment. The server
 	* responds with the updated attachment data list so that any future
@ -232,13 +234,13 @@ phpbb.plupload.updateHiddenData = function(row, attach, index) {
 	* @param {object} row		jQuery object for the attachment row.
 	* @param {int} attachId	Attachment id of the file to be removed.
 	*/
-phpbb.plupload.deleteFile = function(row, attachId) {
+	phpbb.plupload.deleteFile = function(row, attachId) {
 	// If there's no attach id, then the file hasn't been uploaded. Simply delete the row.
 		if (typeof attachId === 'undefined') {
 			var file = phpbb.plupload.uploader.getFile(row.attr('id'));
 			phpbb.plupload.uploader.removeFile(file);

-		row.slideUp(100, function() {
+			row.slideUp(100, () => {
 				row.remove();
 				phpbb.plupload.hideEmptyList();
 			});
@ -250,6 +252,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
 		if (index === false) {
 			return;
 		}
+
 		var fields = {};
 		fields['delete_file[' + index + ']'] = 1;

@ -289,7 +292,8 @@ phpbb.plupload.deleteFile = function(row, attachId) {
 				var file = phpbb.plupload.uploader.getFile(row.attr('id'));
 				phpbb.plupload.uploader.removeFile(file);
 			}
-		row.slideUp(100, function() {
+
+			row.slideUp(100, () => {
 				row.remove();
 				// Hide the file list if it's empty now.
 				phpbb.plupload.hideEmptyList();
@ -300,22 +304,22 @@ phpbb.plupload.deleteFile = function(row, attachId) {
 		$.ajax(phpbb.plupload.config.url, {
 			type: 'POST',
 			data: $.extend(fields, phpbb.plupload.getSerializedData()),
-		headers: phpbb.plupload.config.headers
+			headers: phpbb.plupload.config.headers,
 		})
 			.always(always)
 			.done(done);
-};
+	};

-/**
+	/**
 	* Check the attachment list and hide its container if it's empty.
 	*/
-phpbb.plupload.hideEmptyList = function() {
+	phpbb.plupload.hideEmptyList = function() {
 		if (!$('#file-list').children().length) {
 			$('#file-list-container').slideUp(100);
 		}
-};
+	};

-/**
+	/**
 	* Update the indices used in inline attachment bbcodes. This ensures that the
 	* bbcodes correspond to the correct file after a file is added or removed.
 	* This should be called before the phpbb.plupload,data and phpbb.plupload.ids
@ -324,10 +328,10 @@ phpbb.plupload.hideEmptyList = function() {
 	* @param {string} action	The action that occurred -- either "addition" or "removal"
 	* @param {int} index		The index of the attachment from phpbb.plupload.ids that was affected.
 	*/
-phpbb.plupload.updateBbcode = function(action, index) {
-	var	textarea = $('#message', phpbb.plupload.form),
-		text = textarea.val(),
-		removal = (action === 'removal');
+	phpbb.plupload.updateBbcode = function(action, index) {
+		const	textarea = $('#message', phpbb.plupload.form);
+		var text = textarea.val();
+		var removal = (action === 'removal');

 		// Return if the bbcode isn't used at all.
 		if (text.indexOf('[attachment=') === -1) {
@ -336,11 +340,12 @@ phpbb.plupload.updateBbcode = function(action, index) {

 		function runUpdate(i) {
 			var regex = new RegExp('\\[attachment=' + i + '\\](.*?)\\[\\/attachment\\]', 'g');
-		text = text.replace(regex, function updateBbcode(_, fileName) {
+			text = text.replace(regex, (_, fileName) => {
 			// Remove the bbcode if the file was removed.
 				if (removal && index === i) {
 					return '';
 				}
+
 				var newIndex = i + ((removal) ? -1 : 1);
 				return '[attachment=' + newIndex + ']' + fileName + '[/attachment]';
 			});
@ -360,9 +365,9 @@ phpbb.plupload.updateBbcode = function(action, index) {
 		}

 		textarea.val(text);
-};
+	};

-/**
+	/**
 	* Get Plupload file objects based on their upload status.
 	*
 	* @param {int} status Plupload status - plupload.DONE, plupload.FAILED,
@ -370,25 +375,25 @@ phpbb.plupload.updateBbcode = function(action, index) {
 	*
 	* @returns {Array} The Plupload file objects matching the status.
 	*/
-phpbb.plupload.getFilesByStatus = function(status) {
+	phpbb.plupload.getFilesByStatus = function(status) {
 		var files = [];

-	$.each(phpbb.plupload.uploader.files, function(i, file) {
+		$.each(phpbb.plupload.uploader.files, (i, file) => {
 			if (file.status === status) {
 				files.push(file);
 			}
 		});
 		return files;
-};
+	};

-/**
+	/**
 	* Check whether the user has reached the maximun number of files that he's allowed
 	* to upload. If so, disables the uploader and marks the queued files as failed. Otherwise
 	* makes sure that the uploader is enabled.
 	*
 	* @returns {bool} True if the limit has been reached. False if otherwise.
 	*/
-phpbb.plupload.handleMaxFilesReached = function() {
+	phpbb.plupload.handleMaxFilesReached = function() {
 	// If there is no limit, the user is an admin or moderator.
 		if (!phpbb.plupload.maxFiles) {
 			return false;
@ -402,81 +407,87 @@ phpbb.plupload.handleMaxFilesReached = function() {
 			phpbb.plupload.uploader.trigger('Error', { message: phpbb.plupload.lang.TOO_MANY_ATTACHMENTS });

 			return true;
-	} else if (phpbb.plupload.maxFiles > phpbb.plupload.ids.length) {
+		}
+
+		if (phpbb.plupload.maxFiles > phpbb.plupload.ids.length) {
 		// Enable the uploader if the user is under the limit
 			phpbb.plupload.enableUploader();
 		}
-	return false;
-};

-/**
+		return false;
+	};
+
+	/**
 	* Disable the uploader
 	*/
-phpbb.plupload.disableUploader = function() {
+	phpbb.plupload.disableUploader = function() {
 		$('#add_files').addClass('disabled');
 		phpbb.plupload.uploader.disableBrowse();
-};
+	};

-/**
+	/**
 	* Enable the uploader
 	*/
-phpbb.plupload.enableUploader = function() {
+	phpbb.plupload.enableUploader = function() {
 		$('#add_files').removeClass('disabled');
 		phpbb.plupload.uploader.disableBrowse(false);
-};
+	};

-/**
+	/**
 	* Mark all queued files as failed.
 	*
 	* @param {string} error Error message to present to the user.
 	*/
-phpbb.plupload.markQueuedFailed = function(error) {
+	phpbb.plupload.markQueuedFailed = function(error) {
 		var files = phpbb.plupload.getFilesByStatus(plupload.QUEUED);

-	$.each(files, function(i, file) {
+		$.each(files, (i, file) => {
 			$('#' + file.id).find('.file-progress').hide();
 			phpbb.plupload.fileError(file, error);
 		});
-};
+	};

-/**
+	/**
 	* Marks a file as failed and sets the error message for it.
 	*
 	* @param {object} file		Plupload file object that failed.
 	* @param {string} error	Error message to present to the user.
 	*/
-phpbb.plupload.fileError = function(file, error) {
+	phpbb.plupload.fileError = function(file, error) {
 		file.status = plupload.FAILED;
 		file.error = error;
 		$('#' + file.id).find('.file-status')
 			.addClass('file-error')
 			.attr({
 				'data-error-title': phpbb.plupload.lang.ERROR,
-			'data-error-message': error
+				'data-error-message': error,
 			});
-};
+	};

-
-/**
+	/**
 	* Set up the Plupload object and get some basic data.
 	*/
-phpbb.plupload.uploader = new plupload.Uploader(phpbb.plupload.config);
-phpbb.plupload.initialize();
+	phpbb.plupload.uploader = new plupload.Uploader(phpbb.plupload.config);
+	phpbb.plupload.initialize();

-/**
+	/**
 	* Add a file filter to check for max file sizes per mime type.
 	*/
-plupload.addFileFilter('mime_types_max_file_size', function(types, file, callback) {
+	plupload.addFileFilter('mime_types_max_file_size', (types, file, callback) => {
 		if (file.size !== 'undefined') {
-		$(types).each(function(i, type) {
-			let extensions = [],
-				extsArray = type.extensions.split(',');
+			$(types).each((i, type) => {
+				const extensions = [];
+				const extsArray = type.extensions.split(',');

-			$(extsArray).each(function(i, extension) {
-				/^\s*\*\s*$/.test(extension) ? extensions.push("\\.*") : extensions.push("\\." + extension.replace(new RegExp("[" + "/^$.*+?|()[]{}\\".replace(/./g, "\\$&") + "]", "g"), "\\$&"));
+				$(extsArray).each((i, extension) => {
+					if (/^\s*\*\s*$/.test(extension)) {
+						extensions.push('\\.*');
+					} else {
+						extensions.push('\\.' + extension.replace(new RegExp('[' + '/^$.*+?|()[]{}\\'.replace(/./g, '\\$&') + ']', 'g'), '\\$&'));
+					}
 				});

-			let regex = new RegExp("(" + extensions.join("|") + ")$", "i");
+				const regex = new RegExp('(' + extensions.join('|') + ')$', 'i');

 				if (regex.test(file.name)) {
 					if (type.max_file_size !== 'undefined' && type.max_file_size) {
@ -484,7 +495,7 @@ plupload.addFileFilter('mime_types_max_file_size', function(types, file, callbac
 							phpbb.plupload.uploader.trigger('Error', {
 								code: plupload.FILE_SIZE_ERROR,
 								message: plupload.translate('File size error.'),
-							file: file
+								file,
 							});

 							callback(false);
@ -499,44 +510,44 @@ plupload.addFileFilter('mime_types_max_file_size', function(types, file, callbac
 				}
 			});
 		}
-});
+	});

-var $fileList = $('#file-list');
+	var $fileList = $('#file-list');

-/**
+	/**
 	* Insert inline attachment bbcode.
 	*/
-$fileList.on('click', '.file-inline-bbcode', function(e) {
-	var attachId = $(this).parents('.attach-row').attr('data-attach-id'),
-		index = phpbb.plupload.getIndex(attachId);
+	$fileList.on('click', '.file-inline-bbcode', function(e) {
+		var attachId = $(this).parents('.attach-row').attr('data-attach-id');
+		var index = phpbb.plupload.getIndex(attachId);

 		attachInline(index, phpbb.plupload.data[index].real_filename);
 		e.preventDefault();
-});
+	});

-/**
+	/**
 	* Delete a file.
 	*/
-$fileList.on('click', '.file-delete', function(e) {
-	var row = $(this).parents('.attach-row'),
-		attachId = row.attr('data-attach-id');
+	$fileList.on('click', '.file-delete', function(e) {
+		var row = $(this).parents('.attach-row');
+		var attachId = row.attr('data-attach-id');

 		phpbb.plupload.deleteFile(row, attachId);
 		e.preventDefault();
-});
+	});

-/**
+	/**
 	* Display the error message for a particular file when the error icon is clicked.
 	*/
-$fileList.on('click', '.file-error', function(e) {
+	$fileList.on('click', '.file-error', function(e) {
 		phpbb.alert($(this).attr('data-error-title'), $(this).attr('data-error-message'));
 		e.preventDefault();
-});
+	});

-/**
+	/**
 	* Fires when an error occurs.
 	*/
-phpbb.plupload.uploader.bind('Error', function(up, error) {
+	phpbb.plupload.uploader.bind('Error', (up, error) => {
 		error.file.name = plupload.xmlEncode(error.file.name);

 		// The error message that Plupload provides for these is vague, so we'll be more specific.
@ -545,10 +556,11 @@ phpbb.plupload.uploader.bind('Error', function(up, error) {
 		} else if (error.code === plupload.FILE_SIZE_ERROR) {
 			error.message = plupload.translate('File too large:') + ' ' + error.file.name;
 		}
-	phpbb.alert(phpbb.plupload.lang.ERROR, error.message);
-});

-/**
+		phpbb.alert(phpbb.plupload.lang.ERROR, error.message);
+	});
+
+	/**
 	* Fires before a given file is about to be uploaded. This allows us to
 	* send the real filename along with the chunk. This is necessary because
 	* for some reason the filename is set to 'blob' whenever a file is chunked
@ -556,15 +568,15 @@ phpbb.plupload.uploader.bind('Error', function(up, error) {
 	* @param {object} up	The plupload.Uploader object
 	* @param {object} file	The plupload.File object that is about to be uploaded
 	*/
-phpbb.plupload.uploader.bind('BeforeUpload', function(up, file) {
+	phpbb.plupload.uploader.bind('BeforeUpload', (up, file) => {
 		if (phpbb.plupload.handleMaxFilesReached()) {
 			return;
 		}

 		phpbb.plupload.updateMultipartParams({ real_filename: file.name });
-});
+	});

-/**
+	/**
 	* Fired when a single chunk of any given file is uploaded. This parses the
 	* response from the server and checks for an error. If an error occurs it
 	* is reported to the user and the upload of this particular file is halted
@ -574,7 +586,7 @@ phpbb.plupload.uploader.bind('BeforeUpload', function(up, file) {
 	* 	been uploaded
 	* @param {object} response	The response object from the server
 	*/
-phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
+	phpbb.plupload.uploader.bind('ChunkUploaded', (up, file, response) => {
 		if (response.chunk >= response.chunks - 1) {
 			return;
 		}
@ -582,14 +594,14 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
 		var json = {};
 		try {
 			json = $.parseJSON(response.response);
-	} catch (e) {
+		} catch {
 			file.status = plupload.FAILED;
 			up.trigger('FileUploaded', file, {
 				response: JSON.stringify({
 					error: {
-					message: 'Error parsing server response.'
-				}
-			})
+						message: 'Error parsing server response.',
+					},
+				}),
 			});
 		}

@ -603,17 +615,17 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
 			up.trigger('FileUploaded', file, {
 				response: JSON.stringify({
 					error: {
-					message: json.error.message
-				}
-			})
+						message: json.error.message,
+					},
+				}),
 			});
 		}
-});
+	});

-/**
+	/**
 	* Fires when files are added to the queue.
 	*/
-phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {
+	phpbb.plupload.uploader.bind('FilesAdded', (up, files) => {
 	// Prevent unnecessary requests to the server if the user already uploaded
 	// the maximum number of files allowed.
 		if (phpbb.plupload.handleMaxFilesReached()) {
@ -631,11 +643,11 @@ phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {
 			$fileListContainer.show(100);
 		}

-	$.each(files, function(i, file) {
+		$.each(files, (i, file) => {
 			phpbb.plupload.insertRow(file);
 		});

-	up.bind('UploadProgress', function(up, file) {
+		up.bind('UploadProgress', (up, file) => {
 			$('.file-progress-bar', '#' + file.id).css('width', file.percent + '%');
 			$('#file-total-progress-bar').css('width', up.total.percent + '%');
 		});
@ -645,10 +657,9 @@ phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {

 		// Start uploading the files once the user has selected them.
 		up.start();
-});
+	});

-
-/**
+	/**
 	* Fires when an entire file has been uploaded. It checks for errors
 	* returned by the server otherwise parses the list of attachment data and
 	* appends it to the next file upload so that the server can maintain state
@ -659,17 +670,17 @@ phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {
 	* 	uploaded
 	* @param {string} response	The response string from the server
 	*/
-phpbb.plupload.uploader.bind('FileUploaded', function(up, file, response) {
-	var json = {},
-		row = $('#' + file.id),
-		error;
+	phpbb.plupload.uploader.bind('FileUploaded', (up, file, response) => {
+		var json = {};
+		var row = $('#' + file.id);
+		var error;

 		// Hide the progress indicator.
 		row.find('.file-progress').hide();

 		try {
 			json = JSON.parse(response.response);
-	} catch (e) {
+		} catch {
 			error = 'Error parsing server response.';
 		}

@ -692,16 +703,16 @@ phpbb.plupload.uploader.bind('FileUploaded', function(up, file, response) {
 			row.attr('data-attach-id', file.attachment_data.attach_id);
 			row.find('.file-inline-bbcode').show();
 			row.find('.file-status').addClass('file-uploaded');
-		phpbb.plupload.update(json.data, 'addition', 0, [json.download_url]);
+			phpbb.plupload.update(json.data, 'addition', 0, [ json.download_url ]);
 		}
-});
+	});

-/**
+	/**
 	* Fires when the entire queue of files have been uploaded.
 	*/
-phpbb.plupload.uploader.bind('UploadComplete', function() {
+	phpbb.plupload.uploader.bind('UploadComplete', () => {
 	// Hide the progress bar
-	setTimeout(function() {
+		setTimeout(() => {
 			$('#file-total-progress-bar').fadeOut(500, function() {
 				$(this).css('width', 0).show();
 			});
@ -709,6 +720,5 @@ phpbb.plupload.uploader.bind('UploadComplete', function() {

 		// Re-enable the uploader
 		phpbb.plupload.enableUploader();
-});
-
+	});
 })(jQuery); // Avoid conflicts with other libraries
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@ -161,6 +161,16 @@ class environment extends \Twig\Environment
 		return $this->assets_bag;
 	}

+	/**
+	 * Gets the event dispatcher instance
+	 *
+	 * @return dispatcher_interface
+	 */
+	public function get_phpbb_dispatcher()
+	{
+		return $this->phpbb_dispatcher;
+	}
+
 	/**
 	* Get the namespace look up order
 	*
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@ -24,9 +24,13 @@ class event extends \Twig\Node\Node
 	/** @var \phpbb\template\twig\environment */
 	protected $environment;

-	public function __construct(\Twig\Node\Expression\AbstractExpression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
+	/** @var array */
+	protected $template_event_priority_array;
+
+	public function __construct(\Twig\Node\Expression\AbstractExpression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null, $template_event_priority_array = [])
 	{
 		$this->environment = $environment;
+		$this->template_event_priority_array = $template_event_priority_array;

 		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
 	}
@ -42,10 +46,20 @@ class event extends \Twig\Node\Node

 		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name');

+		$template_event_listeners = [];
+
+		// Group and sort extension template events in according to their priority (0 by default if not set)
 		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
 		{
 			$ext_namespace = str_replace('/', '_', $ext_namespace);
+			$priority_key = intval($this->template_event_priority_array[$ext_namespace][$location] ?? 0);
+			$template_event_listeners[$priority_key][] = $ext_namespace;
+		}
+		krsort($template_event_listeners);

+		$template_event_listeners = array_merge(...$template_event_listeners);
+		foreach ($template_event_listeners as $ext_namespace)
+		{
 			if ($this->environment->isDebug())
 			{
 				// If debug mode is enabled, lets check for new/removed EVENT
@ -54,8 +68,7 @@ class event extends \Twig\Node\Node
 				//  purge the cache when a new event template file is added)
 				$compiler
 					->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
-					->indent()
-				;
+					->indent();
 			}

 			if ($this->environment->isDebug() || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
@ -66,16 +79,14 @@ class event extends \Twig\Node\Node
 					// We set the namespace lookup order to be this extension first, then the main path
 					->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
 					->write("\$this->env->loadTemplate(\$this->env->getTemplateClass('@{$ext_namespace}/{$location}.html'), '@{$ext_namespace}/{$location}.html')->display(\$context);\n")
-					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
-				;
+					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n");
 			}

 			if ($this->environment->isDebug())
 			{
 				$compiler
 					->outdent()
-					->write("}\n\n")
-				;
+					->write("}\n\n");
 			}
 		}
 	}
--- a/phpBB/phpbb/template/twig/tokenparser/event.php
+++ b/phpBB/phpbb/template/twig/tokenparser/event.php
@ -18,6 +18,9 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 	/** @var \phpbb\template\twig\environment */
 	protected $environment;

+	/** @var array */
+	protected $template_event_priority_array;
+
 	/**
 	* Constructor
 	*
@ -26,6 +29,25 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 	public function __construct(\phpbb\template\twig\environment $environment)
 	{
 		$this->environment = $environment;
+		$phpbb_dispatcher = $this->environment->get_phpbb_dispatcher();
+
+		$template_event_priority_array = [];
+		/**
+		 * Allows assigning priority to template event listeners
+		 *
+		 * @event core.twig_event_tokenparser_constructor
+		 * @var	array	template_event_priority_array	Array with template event priority assignments per extension namespace
+		 *
+		 * @since 4.0.0-a1
+		 */
+		if ($phpbb_dispatcher)
+		{
+			$vars = ['template_event_priority_array'];
+			extract($phpbb_dispatcher->trigger_event('core.twig_event_tokenparser_constructor', compact($vars)));
+		}
+
+		$this->template_event_priority_array = $template_event_priority_array;
+		unset($template_event_priority_array);
 	}

 	/**
@ -42,7 +64,7 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 		$stream = $this->parser->getStream();
 		$stream->expect(\Twig\Token::BLOCK_END_TYPE);

-		return new \phpbb\template\twig\node\event($expr, $this->environment, $token->getLine(), $this->getTag());
+		return new \phpbb\template\twig\node\event($expr, $this->environment, $token->getLine(), $this->getTag(), $this->template_event_priority_array);
 	}

 	/**
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@ -1,23 +1,24 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-var: 0 */

 (function($) { // Avoid conflicts with other libraries
+	'use strict';

-'use strict';
-
-// This callback will mark all forum icons read
-phpbb.addAjaxCallback('mark_forums_read', function(res) {
+	// This callback will mark all forum icons read
+	phpbb.addAjaxCallback('mark_forums_read', function(res) {
 		var readTitle = res.NO_UNREAD_POSTS;
 		var unreadTitle = res.UNREAD_POSTS;
 		var iconsArray = {
 			forum_unread: 'forum_read',
 			forum_unread_subforum: 'forum_read_subforum',
-		forum_unread_locked: 'forum_read_locked'
+			forum_unread_locked: 'forum_read_locked',
 		};

 		$('li.row').find('dl[class*="forum_unread"]').each(function() {
 			var $this = $(this);

-		$.each(iconsArray, function(unreadClass, readClass) {
+			$.each(iconsArray, (unreadClass, readClass) => {
 				if ($this.hasClass(unreadClass)) {
 					$this.removeClass(unreadClass).addClass(readClass);
 				}
@ -37,25 +38,24 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 		$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS);

 		phpbb.closeDarkenWrapper(3000);
-});
+	});

-/**
-* This callback will mark all topic icons read
-*
-* @param {bool} [update_topic_links=true] Whether "Mark topics read" links
-* 	should be updated. Defaults to true.
-*/
-phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
+	/**
+	* This callback will mark all topic icons read
+	*
+	* @param {bool} [update_topic_links=true] Whether "Mark topics read" links
+	* 	should be updated. Defaults to true.
+	*/
+	phpbb.addAjaxCallback('mark_topics_read', (res, updateTopicLinks) => {
 		var readTitle = res.NO_UNREAD_POSTS;
 		var unreadTitle = res.UNREAD_POSTS;
 		var iconsArray = {
 			global_unread: 'global_read',
 			announce_unread: 'announce_read',
 			sticky_unread: 'sticky_read',
-		topic_unread: 'topic_read'
+			topic_unread: 'topic_read',
 		};
-	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
-	var unreadClassSelectors;
+		var iconsState = [ '', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine' ];
 		var classMap = {};
 		var classNames = [];

@ -63,22 +63,23 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
 			updateTopicLinks = true;
 		}

-	$.each(iconsArray, function(unreadClass, readClass) {
-		$.each(iconsState, function(key, value) {
+		$.each(iconsArray, (unreadClass, readClass) => {
+			$.each(iconsState, (key, value) => {
 			// Only topics can be hot
 				if ((value === '_hot' || value === '_hot_mine') && unreadClass !== 'topic_unread') {
 					return true;
 				}
+
 				classMap[unreadClass + value] = readClass + value;
 				classNames.push(unreadClass + value);
 			});
 		});

-	unreadClassSelectors = '.' + classNames.join(',.');
+		var unreadClassSelectors = '.' + classNames.join(',.');

 		$('li.row').find(unreadClassSelectors).each(function() {
 			var $this = $(this);
-		$.each(classMap, function(unreadClass, readClass) {
+			$.each(classMap, (unreadClass, readClass) => {
 				if ($this.hasClass(unreadClass)) {
 					$this.removeClass(unreadClass).addClass(readClass);
 				}
@ -95,32 +96,32 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
 		}

 		phpbb.closeDarkenWrapper(3000);
-});
+	});

-// This callback will mark all notifications read
-phpbb.addAjaxCallback('notification.mark_all_read', function(res) {
+	// This callback will mark all notifications read
+	phpbb.addAjaxCallback('notification.mark_all_read', res => {
 		if (typeof res.success !== 'undefined') {
 			phpbb.markNotifications($('[data-notification-unread="true"]'), 0);
 			phpbb.toggleDropdown.call($('#notification-button'));
 			phpbb.closeDarkenWrapper(3000);
 		}
-});
+	});

-// This callback will mark a notification read
-phpbb.addAjaxCallback('notification.mark_read', function(res) {
+	// This callback will mark a notification read
+	phpbb.addAjaxCallback('notification.mark_read', function(res) {
 		if (typeof res.success !== 'undefined') {
 			var unreadCount = Number($('#notification-button strong').html()) - 1;
 			phpbb.markNotifications($(this).parent('[data-notification-unread="true"]'), unreadCount);
 		}
-});
+	});

-/**
+	/**
 	* Mark notification popup rows as read.
 	*
 	* @param {jQuery} $popup jQuery object(s) to mark read.
 	* @param {int} unreadCount The new unread notifications count.
 	*/
-phpbb.markNotifications = function($popup, unreadCount) {
+	phpbb.markNotifications = function($popup, unreadCount) {
 	// Remove the unread status.
 		$popup.removeClass('bg2');
 		$popup.find('a.mark_read').remove();
@ -143,12 +144,12 @@ phpbb.markNotifications = function($popup, unreadCount) {
 		var $title = $('title');
 		var originalTitle = $title.text().replace(/(\((\d+)\))/, '');
 		$title.text((unreadCount ? '(' + unreadCount + ')' : '') + originalTitle);
-};
+	};

-// This callback finds the post from the delete link, and removes it.
-phpbb.addAjaxCallback('post_delete', function() {
-	var $this = $(this),
-		postId;
+	// This callback finds the post from the delete link, and removes it.
+	phpbb.addAjaxCallback('post_delete', function() {
+		var $this = $(this);
+		var postId;

 		if ($this.attr('data-refresh') === undefined) {
 			postId = $this[0].href.split('&p=')[1];
@ -158,14 +159,15 @@ phpbb.addAjaxCallback('post_delete', function() {
 				post.nextAll('.bg2').removeClass('bg2').addClass('bg1');
 				posts1.removeClass('bg1').addClass('bg2');
 			}
+
 			post.fadeOut(function() {
 				$(this).remove();
 			});
 		}
-});
+	});

-// This callback removes the approve / disapprove div or link.
-phpbb.addAjaxCallback('post_visibility', function(res) {
+	// This callback removes the approve / disapprove div or link.
+	phpbb.addAjaxCallback('post_visibility', function(res) {
 		var remove = (res.visible) ? $(this) : $(this).parents('.post');
 		$(remove).css('pointer-events', 'none').fadeOut(function() {
 			$(this).remove();
@ -177,15 +179,15 @@ phpbb.addAjaxCallback('post_visibility', function(res) {
 				$(this).remove();
 			});
 		}
-});
+	});

-// This removes the parent row of the link or form that fired the callback.
-phpbb.addAjaxCallback('row_delete', function() {
+	// This removes the parent row of the link or form that fired the callback.
+	phpbb.addAjaxCallback('row_delete', function() {
 		$(this).parents('tr').remove();
-});
+	});

-// This handles friend / foe additions removals.
-phpbb.addAjaxCallback('zebra', function(res) {
+	// This handles friend / foe additions removals.
+	phpbb.addAjaxCallback('zebra', res => {
 		var zebra;

 		if (res.success) {
@ -193,12 +195,12 @@ phpbb.addAjaxCallback('zebra', function(res) {
 			zebra.first().html(res.MESSAGE_TEXT);
 			zebra.not(':first').html('&nbsp;').prev().html('&nbsp;');
 		}
-});
+	});

-/**
+	/**
 	* This callback updates the poll results after voting.
 	*/
-phpbb.addAjaxCallback('vote_poll', function(res) {
+	phpbb.addAjaxCallback('vote_poll', function(res) {
 		if (typeof res.success !== 'undefined') {
 			var poll = $(this).closest('.topic_poll');
 			var panel = poll.find('.panel');
@ -206,10 +208,11 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 			var mostVotes = 0;

 			// Set min-height to prevent the page from jumping when the content changes
-		var updatePanelHeight = function (height) {
+			var updatePanelHeight = function(height) {
 				height = (typeof height === 'undefined') ? panel.find('.inner').outerHeight() : height;
 				panel.css('min-height', height);
 			};
+
 			updatePanelHeight();

 			// Remove the View results link
@ -217,13 +220,13 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 				poll.find('.poll_view_results').hide(500);
 			}

-		if (!res.can_vote) {
-			poll.find('.polls, .poll_max_votes, .poll_vote, .poll_option_select').fadeOut(500, function () {
-				poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show();
-			});
-		} else {
+			if (res.can_vote) {
 				// If the user can still vote, simply slide down the results
 				poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500);
+			} else {
+				poll.find('.polls, .poll_max_votes, .poll_vote, .poll_option_select').fadeOut(500, () => {
+					poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show();
+				});
 			}

 			// Get the votes count of the highest poll option
@ -242,16 +245,16 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 				var optionId = $this.attr('data-poll-option-id');
 				var voted = (typeof res.user_votes[optionId] !== 'undefined');
 				var mostVoted = (res.vote_counts[optionId] === mostVotes);
-			var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[optionId] / res.total_votes) * 100);
+				var percent = res.total_votes ? Math.round((res.vote_counts[optionId] / res.total_votes) * 100) : 0;
 				var percentRel = (mostVotes === 0) ? 0 : Math.round((res.vote_counts[optionId] / mostVotes) * 100);
-			var altText;

-			altText = $this.attr('data-alt-text');
+				var altText = $this.attr('data-alt-text');
 				if (voted) {
 					$this.attr('title', $.trim(altText));
 				} else {
 					$this.attr('title', '');
-			};
+				}
+
 				$this.toggleClass('voted', voted);
 				$this.toggleClass('most-votes', mostVoted);

@ -260,7 +263,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 				var barTimeLapse = (res.can_vote) ? 500 : 1500;
 				var newBarClass = (percent === 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1);

-			setTimeout(function () {
+				setTimeout(() => {
 					bar.animate({ width: percentRel + '%' }, 500)
 						.removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5')
 						.addClass(newBarClass)
@ -282,34 +285,34 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
 					updatePanelHeight();
 				}

-			$(this).delay(5000).fadeOut(500, function() {
+				$(this).delay(5000).fadeOut(500, () => {
 					resizePanel(300);
 				});
 			});

 			// Remove the gap resulting from removing options
-		setTimeout(function() {
+			setTimeout(() => {
 				resizePanel(500);
 			}, 1500);

-		var resizePanel = function (time) {
+			var resizePanel = function(time) {
 				var panelHeight = panel.height();
 				var innerHeight = panel.find('.inner').outerHeight();

 				if (panelHeight !== innerHeight) {
 					panel.css({ minHeight: '', height: panelHeight })
-					.animate({ height: innerHeight }, time, function () {
+						.animate({ height: innerHeight }, time, () => {
 							panel.css({ minHeight: innerHeight, height: '' });
 						});
 				}
 			};
 		}
-});
+	});

-/**
+	/**
 	* Show poll results when clicking View results link.
 	*/
-$('.poll_view_results a').click(function(e) {
+	$('.poll_view_results a').click(function(e) {
 	// Do not follow the link
 		e.preventDefault();

@ -317,41 +320,38 @@ $('.poll_view_results a').click(function(e) {

 		$poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500);
 		$poll.find('.poll_view_results').hide(500);
-});
+	});

-$('[data-ajax]').each(function() {
+	$('[data-ajax]').each(function() {
 		var $this = $(this);
 		var ajax = $this.attr('data-ajax');
 		var filter = $this.attr('data-filter');

 		if (ajax !== 'false') {
-		var fn = (ajax !== 'true') ? ajax : null;
-		filter = (filter !== undefined) ? phpbb.getFunctionByName(filter) : null;
+			var fn = ajax === 'true' ? null : ajax;
+			filter = filter === undefined ? null : phpbb.getFunctionByName(filter);

 			phpbb.ajaxify({
 				selector: this,
 				refresh: $this.attr('data-refresh') !== undefined,
-			filter: filter,
-			callback: fn
+				filter,
+				callback: fn,
 			});
 		}
-});
+	});

-/**
+	/**
 	* This simply appends #preview to the action of the
 	* QR action when you click the Full Editor & Preview button
 	*/
-$('#qr_full_editor').click(function() {
-	$('#qr_postform').attr('action', function(i, val) {
-		return val + '#preview';
+	$('#qr_full_editor').click(() => {
+		$('#qr_postform').attr('action', (i, val) => val + '#preview');
 	});
-});

-
-/**
+	/**
 	* Make the display post links to use JS
 	*/
-$('.display_post').click(function(e) {
+	$('.display_post').click(function(e) {
 	// Do not follow the link
 		e.preventDefault();

@ -359,27 +359,27 @@ $('.display_post').click(function(e) {
 		$('#post_content' + postId).show();
 		$('#profile' + postId).show();
 		$('#post_hidden' + postId).hide();
-});
+	});

-/**
+	/**
 	* Display hidden post on post review page
 	*/
-$('.display_post_review').on('click', function(e) {
+	$('.display_post_review').on('click', function(e) {
 		e.preventDefault();

-	let $displayPostLink = $(this);
+		const $displayPostLink = $(this);
 		$displayPostLink.closest('.post-ignore').removeClass('post-ignore');
 		$displayPostLink.hide();
-});
+	});

-/**
-* Toggle the member search panel in memberlist.php.
-*
-* If user returns to search page after viewing results the search panel is automatically displayed.
-* In any case the link will toggle the display status of the search panel and link text will be
-* appropriately changed based on the status of the search panel.
-*/
-$('#member_search').click(function () {
+	/**
+	* Toggle the member search panel in memberlist.php.
+	*
+	* If user returns to search page after viewing results the search panel is automatically displayed.
+	* In any case the link will toggle the display status of the search panel and link text will be
+	* appropriately changed based on the status of the search panel.
+	*/
+	$('#member_search').click(function() {
 		var $memberlistSearch = $('#memberlist_search');

 		$memberlistSearch.slideToggle('fast');
@ -389,17 +389,18 @@ $('#member_search').click(function () {
 		if ($memberlistSearch.is(':visible')) {
 			$('#username').focus();
 		}
-	return false;
-});

-/**
+		return false;
+	});
+
+	/**
 	* Show to top button if available on page
 	*/
-const $scrollTopButton = $('.to-top-button');
+	const $scrollTopButton = $('.to-top-button');

-if ($scrollTopButton.length) {
+	if ($scrollTopButton.length) {
 	// Show or hide the button based on scroll position
-	$(window).scroll(function () {
+		$(window).scroll(function() {
 			if ($(this).scrollTop() > 300) {
 				$scrollTopButton.fadeIn(); // Fade in the button
 			} else {
@ -408,20 +409,18 @@ if ($scrollTopButton.length) {
 		});

 		// Scroll smoothly to the top when the button is clicked
-	$scrollTopButton.click(function (e) {
+		$scrollTopButton.click(e => {
 			e.preventDefault(); // Prevent the default anchor link behavior
-		$('html, body').animate({scrollTop: 0}, 500); // Smooth scroll to top
+			$('html, body').animate({ scrollTop: 0 }, 500); // Smooth scroll to top
 		});
-}
+	}

-/**
-* Automatically resize textarea
-*/
-$(function() {
+	/**
+	* Automatically resize textarea
+	*/
+	$(() => {
 		var $textarea = $('textarea:not(#message-box textarea, .no-auto-resize)');
 		phpbb.resizeTextArea($textarea, { minHeight: 75, maxHeight: 250 });
 		phpbb.resizeTextArea($('textarea', '#message-box'));
-});
-
-
+	});
 })(jQuery); // Avoid conflicts with other libraries
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@ -1,4 +1,7 @@
 /* global phpbb */
+/* eslint camelcase: 0 */
+/* eslint no-unused-vars: 0 */
+/* eslint no-var:0 */

 /**
 * phpBB forum functions
@ -34,10 +37,10 @@ function popup(url, width, height, name) {
 function pageJump(item) {
 	'use strict';

-	var page = parseInt(item.val(), 10),
-		perPage = item.attr('data-per-page'),
-		baseUrl = item.attr('data-base-url'),
-		startName = item.attr('data-start-name');
+	var page = parseInt(item.val(), 10);
+	var perPage = item.attr('data-per-page');
+	var baseUrl = item.attr('data-base-url');
+	var startName = item.attr('data-start-name');

 	if (page !== null && !isNaN(page) && page === Math.floor(page) && page > 0) {
 		if (baseUrl.indexOf('?') === -1) {
@ -78,39 +81,38 @@ function viewableArea(e, itself) {
 		e = e.parentNode;
 	}

-	if (!e.vaHeight) {
+	if (e.vaHeight) {
+		// Restore viewable area height to the default
+		e.style.height = e.vaHeight + 'px';
+		e.style.overflow = 'auto';
+		e.style.maxHeight = e.vaMaxHeight;
+		e.vaHeight = false;
+	} else {
 		// Store viewable area height before changing style to auto
 		e.vaHeight = e.offsetHeight;
 		e.vaMaxHeight = e.style.maxHeight;
 		e.style.height = 'auto';
 		e.style.maxHeight = 'none';
 		e.style.overflow = 'visible';
-	} else {
-		// Restore viewable area height to the default
-		e.style.height = e.vaHeight + 'px';
-		e.style.overflow = 'auto';
-		e.style.maxHeight = e.vaMaxHeight;
-		e.vaHeight = false;
 	}
 }

 /**
 * Alternate display of subPanels
 */
-jQuery(function($) {
+jQuery($ => {
 	'use strict';

 	$('.sub-panels').each(function() {
-
-		var $childNodes = $('a[data-subpanel]', this),
-			panels = $childNodes.map(function () {
+		var $childNodes = $('a[data-subpanel]', this);
+		var panels = $childNodes.map(function() {
 			return this.getAttribute('data-subpanel');
-			}),
-			showPanel = this.getAttribute('data-show-panel');
+		});
+		var showPanel = this.getAttribute('data-show-panel');

 		if (panels.length) {
 			activateSubPanel(showPanel, panels);
-			$childNodes.click(function () {
+			$childNodes.click(function() {
 				activateSubPanel(this.getAttribute('data-subpanel'), panels);
 				return false;
 			});
@ -124,11 +126,13 @@ jQuery(function($) {
 function activateSubPanel(p, panels) {
 	'use strict';

-	var i, showPanel;
+	var i;
+	var showPanel;

 	if (typeof p === 'string') {
 		showPanel = p;
 	}
+
 	$('input[name="show_panel"]').val(showPanel);

 	if (typeof panels === 'undefined') {
@ -148,7 +152,8 @@ function selectCode(a) {

 	// Get ID of code block
 	var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];
-	var s, r;
+	var s;
+	var r;

 	// Not IE and IE9+
 	if (window.getSelection) {
@ -164,12 +169,11 @@ function selectCode(a) {
 				s.removeAllRanges();
 				s.addRange(r);
 			}
-		}
+		} else {
 			// Firefox and Opera
-		else {
 			// workaround for bug # 42885
 			if (window.opera && e.innerHTML.substring(e.innerHTML.length - 4) === '<BR>') {
-				e.innerHTML = e.innerHTML + '&nbsp;';
+				e.innerHTML += '&nbsp;';
 			}

 			r = document.createRange();
@ -177,17 +181,15 @@ function selectCode(a) {
 			s.removeAllRanges();
 			s.addRange(r);
 		}
-	}
+	} else if (document.getSelection) {
 		// Some older browsers
-	else if (document.getSelection) {
 		s = document.getSelection();
 		r = document.createRange();
 		r.selectNodeContents(e);
 		s.removeAllRanges();
 		s.addRange(r);
-	}
+	} else if (document.selection) {
 		// IE
-	else if (document.selection) {
 		r = document.body.createTextRange();
 		r.moveToElementText(e);
 		r.select();
@ -229,10 +231,10 @@ function phpbbCheckKey(event) {
 /**
 * Apply onkeypress event for forcing default submit button on ENTER key press
 */
-jQuery(function($) {
+jQuery($ => {
 	'use strict';

-	$('form input[type=text], form input[type=password]').on('keypress', function (e) {
+	$('form input[type=text], form input[type=password]').on('keypress', function(e) {
 		var defaultButton = $(this).parents('form').find('input[type=submit].default-submit-action');

 		if (!defaultButton || defaultButton.length <= 0) {
@ -258,10 +260,10 @@ jQuery(function($) {
 function insertUser(formId, value) {
 	'use strict';

-	var $form = jQuery(formId),
-		formName = $form.attr('data-form-name'),
-		fieldName = $form.attr('data-field-name'),
-		item = opener.document.forms[formName][fieldName];
+	var $form = jQuery(formId);
+	var formName = $form.attr('data-form-name');
+	var fieldName = $form.attr('data-field-name');
+	var item = opener.document.forms[formName][fieldName];

 	if (item.value.length && item.type === 'textarea') {
 		value = item.value + '\n' + value;
@ -293,9 +295,9 @@ function insert_single_user(formId, user) {
 function parseDocument($container) {
 	'use strict';

-	var test = document.createElement('div'),
-		oldBrowser = (typeof test.style.borderRadius === 'undefined'),
-		$body = $('body');
+	var test = document.createElement('div');
+	var oldBrowser = (typeof test.style.borderRadius === 'undefined');
+	var $body = $('body');

 	/**
 	* Reset avatar dimensions when changing URL or EMAIL
@ -322,7 +324,7 @@ function parseDocument($container) {
 	$container.find('.pagination .dropdown-trigger').click(function() {
 		var $dropdownContainer = $(this).parent();
 		// Wait a little bit to make sure the dropdown has activated
-		setTimeout(function() {
+		setTimeout(() => {
 			if ($dropdownContainer.hasClass('dropdown-visible')) {
 				$dropdownContainer.find('input.inputbox').focus();
 			}
@ -333,19 +335,18 @@ function parseDocument($container) {
 	* Resize navigation (breadcrumbs) block to keep all links on same line
 	*/
 	$container.find('.navlinks').each(function() {
-		var $this = $(this),
-			$left = $this.children().not('.rightside'),
-			$right = $this.children('.rightside');
+		var $this = $(this);
+		var $left = $this.children().not('.rightside');
+		var $right = $this.children('.rightside');

 		if ($left.length !== 1 || !$right.length) {
 			return;
 		}

 		function resize() {
-			var width = 0,
-				diff = $left.outerWidth(true) - $left.width(),
-				minWidth = Math.max($this.width() / 3, 240),
-				maxWidth;
+			var width = 0;
+			var diff = $left.outerWidth(true) - $left.width();
+			var minWidth = Math.max($this.width() / 3, 240);

 			$right.each(function() {
 				var $this = $(this);
@ -354,7 +355,7 @@ function parseDocument($container) {
 				}
 			});

-			maxWidth = $this.width() - width - diff;
+			var maxWidth = $this.width() - width - diff;
 			$left.css('max-width', Math.floor(Math.max(maxWidth, minWidth)) + 'px');
 		}

@ -366,14 +367,14 @@ function parseDocument($container) {
 	* Makes breadcrumbs responsive
 	*/
 	$container.find('.breadcrumbs:not([data-skip-responsive])').each(function() {
-		var $this = $(this),
-			$links = $this.find('.crumb'),
-			length = $links.length,
-			classes = ['wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny'],
-			classesLength = classes.length,
-			maxHeight = 0,
-			lastWidth = false,
-			wrapped = false;
+		var $this = $(this);
+		var $links = $this.find('.crumb');
+		var { length } = $links;
+		var classes = [ 'wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny' ];
+		var classesLength = classes.length;
+		var maxHeight = 0;
+		var lastWidth = false;
+		var wrapped = false;

 		// Set tooltips
 		$this.find('a').each(function() {
@ -383,8 +384,8 @@ function parseDocument($container) {

 		// Function that checks breadcrumbs
 		function check() {
-			var height = $this.height(),
-				width;
+			var height = $this.height();
+			var width;

 			// Test max-width set in code for .navlinks above
 			width = parseInt($this.css('max-width'), 10);
@ -404,6 +405,7 @@ function parseDocument($container) {
 					return;
 				}
 			}
+
 			lastWidth = width;

 			if (wrapped) {
@ -454,23 +456,23 @@ function parseDocument($container) {
 	* responsive-show-all to list of classes
 	*/
 	$container.find('.topiclist.responsive-show-all > li > dl').each(function() {
-		var $this = $(this),
-			$block = $this.find('dt .responsive-show:last-child'),
-			first = true;
+		var $this = $(this);
+		var $block = $this.find('dt .responsive-show:last-child');
+		var first = true;

 		// Create block that is visible only on mobile devices
-		if (!$block.length) {
+		if ($block.length) {
+			first = ($.trim($block.text()).length === 0);
+		} else {
 			$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
 			$block = $this.find('dt .responsive-show:last-child');
-		} else {
-			first = ($.trim($block.text()).length === 0);
 		}

 		// Copy contents of each column
 		$this.find('dd').not('.mark').each(function() {
-			var column = $(this),
-				$children = column.children(),
-				html = column.html();
+			var column = $(this);
+			var $children = column.children();
+			var html = column.html();

 			if ($children.length === 1 && $children.text() === column.text()) {
 				html = $children.html();
@ -490,13 +492,13 @@ function parseDocument($container) {
 	* responsive-show-columns to list of classes
 	*/
 	$container.find('.topiclist.responsive-show-columns').each(function() {
-		var $list = $(this),
-			headers = [],
-			headersLength = 0;
+		var $list = $(this);
+		var headers = [];
+		var headersLength = 0;

 		// Find all headers, get contents
 		$list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
-			headers.push($("<div>").text($(this).text()).html());
+			headers.push($('<div>').text($(this).text()).html());
 			headersLength++;
 		});

@ -506,23 +508,23 @@ function parseDocument($container) {

 		// Parse each row
 		$list.find('dl').each(function() {
-			var $this = $(this),
-				$block = $this.find('dt .responsive-show:last-child'),
-				first = true;
+			var $this = $(this);
+			var $block = $this.find('dt .responsive-show:last-child');
+			var first = true;

 			// Create block that is visible only on mobile devices
-			if (!$block.length) {
+			if ($block.length) {
+				first = ($.trim($block.text()).length === 0);
+			} else {
 				$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
 				$block = $this.find('dt .responsive-show:last-child');
-			} else {
-				first = ($.trim($block.text()).length === 0);
 			}

 			// Copy contents of each column
 			$this.find('dd').not('.mark').each(function(i) {
-				var column = $(this),
-					children = column.children(),
-					html = column.html();
+				var column = $(this);
+				var children = column.children();
+				var html = column.html();

 				if (children.length === 1 && children.text() === column.text()) {
 					html = children.html();
@ -544,24 +546,25 @@ function parseDocument($container) {
 	* Responsive tables
 	*/
 	$container.find('table.table1').not('.not-responsive').each(function() {
-		var $this = $(this),
-			$th = $this.find('thead > tr > th'),
-			headers = [],
-			totalHeaders = 0,
-			i, headersLength;
+		var $this = $(this);
+		var $th = $this.find('thead > tr > th');
+		var headers = [];
+		var totalHeaders = 0;
+		var i;

 		// Find each header
 		$th.each(function(column) {
-			var cell = $(this),
-				colspan = parseInt(cell.attr('colspan'), 10),
-				dfn = cell.attr('data-dfn'),
-				text = dfn ? dfn : cell.text();
+			var cell = $(this);
+			var colspan = parseInt(cell.attr('colspan'), 10);
+			var dfn = cell.attr('data-dfn');
+			var text = dfn ? dfn : cell.text();

 			colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;

 			for (i = 0; i < colspan; i++) {
 				headers.push(text);
 			}
+
 			totalHeaders++;

 			if (dfn && !column) {
@ -569,7 +572,7 @@ function parseDocument($container) {
 			}
 		});

-		headersLength = headers.length;
+		var headersLength = headers.length;

 		// Add header text to each cell as <dfn>
 		$this.addClass('responsive');
@ -580,9 +583,9 @@ function parseDocument($container) {
 		}

 		$this.find('tbody > tr').each(function() {
-			var row = $(this),
-				cells = row.children('td'),
-				column = 0;
+			var row = $(this);
+			var cells = row.children('td');
+			var column = 0;

 			if (cells.length === 1) {
 				row.addClass('big-column');
@ -590,9 +593,9 @@ function parseDocument($container) {
 			}

 			cells.each(function() {
-				var cell = $(this),
-					colspan = parseInt(cell.attr('colspan'), 10),
-					text = $.trim(cell.text());
+				var cell = $(this);
+				var colspan = parseInt(cell.attr('colspan'), 10);
+				var text = $.trim(cell.text());

 				if (headersLength <= column) {
 					return;
@ -600,7 +603,7 @@ function parseDocument($container) {

 				if ((text.length && text !== '-') || cell.children().length) {
 					if (headers[column].length) {
-						cell.prepend($("<dfn>").css('display', 'none').text(headers[column]));
+						cell.prepend($('<dfn>').css('display', 'none').text(headers[column]));
 					}
 				} else {
 					cell.addClass('empty');
@ -626,15 +629,15 @@ function parseDocument($container) {
 	* Responsive tabs
 	*/
 	$container.find('#tabs, #minitabs').not('[data-skip-responsive]').each(function() {
-		var $this = $(this),
-			$ul = $this.children(),
-			$tabs = $ul.children().not('[data-skip-responsive]'),
-			$links = $tabs.children('a'),
-			$item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
-			$menu = $item.find('.dropdown-contents'),
-			maxHeight = 0,
-			lastWidth = false,
-			responsive = false;
+		var $this = $(this);
+		var $ul = $this.children();
+		var $tabs = $ul.children().not('[data-skip-responsive]');
+		var $links = $tabs.children('a');
+		var $item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab');
+		var $menu = $item.find('.dropdown-contents');
+		var maxHeight = 0;
+		var lastWidth = false;
+		var responsive = false;

 		$links.each(function() {
 			var $this = $(this);
@ -642,8 +645,8 @@ function parseDocument($container) {
 		});

 		function check() {
-			var width = $body.width(),
-				height = $this.height();
+			var width = $body.width();
+			var height = $this.height();

 			if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) {
 				return;
@ -658,6 +661,7 @@ function parseDocument($container) {
 				if ($item.hasClass('dropdown-visible')) {
 					phpbb.toggleDropdown.call($item.find('a.responsive-tab-link').get(0));
 				}
+
 				return;
 			}

@ -665,29 +669,31 @@ function parseDocument($container) {
 			$item.show();
 			$menu.html('');

-			var $availableTabs = $tabs.filter(':not(.activetab, .responsive-tab)'),
-				total = $availableTabs.length,
-				i, $tab;
+			var $availableTabs = $tabs.filter(':not(.activetab, .responsive-tab)');
+			var total = $availableTabs.length;
+			var i;
+			var $tab;

 			for (i = total - 1; i >= 0; i--) {
 				$tab = $availableTabs.eq(i);
 				$menu.prepend($tab.clone(true).removeClass('tab'));
 				$tab.hide();
 				if ($this.height() <= maxHeight) {
-					$menu.find('a').click(function() {
+					$menu.find('a').click(() => {
 						check(true);
 					});
 					return;
 				}
 			}
-			$menu.find('a').click(function() {
+
+			$menu.find('a').click(() => {
 				check(true);
 			});
 		}

 		var $tabLink = $item.find('a.responsive-tab-link');
 		phpbb.registerDropdown($tabLink, $item.find('.dropdown'), {
-			visibleClass: 'activetab'
+			visibleClass: 'activetab',
 		});

 		check(true);
@ -708,23 +714,26 @@ function parseDocument($container) {
 	* Replace responsive text
 	*/
 	$container.find('[data-responsive-text]').each(function() {
-		var $this = $(this),
-			fullText = $this.text(),
-			responsiveText = $this.attr('data-responsive-text'),
-			responsive = false;
+		var $this = $(this);
+		var fullText = $this.text();
+		var responsiveText = $this.attr('data-responsive-text');
+		var responsive = false;

 		function check() {
 			if ($(window).width() > 700) {
 				if (!responsive) {
 					return;
 				}
+
 				$this.text(fullText);
 				responsive = false;
 				return;
 			}
+
 			if (responsive) {
 				return;
 			}
+
 			$this.text(responsiveText);
 			responsive = true;
 		}
@ -737,7 +746,7 @@ function parseDocument($container) {
 /**
 * Run onload functions
 */
-jQuery(function($) {
+jQuery($ => {
 	'use strict';

 	// Swap .nojs and .hasjs
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@ -16,8 +16,6 @@
 */
 class phpbb_functional_extension_controller_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;

 	protected static $fixtures = array(
--- a/tests/functional/extension_global_lang_test.php
+++ b/tests/functional/extension_global_lang_test.php
@ -16,8 +16,6 @@
 */
 class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;

 	protected static $fixtures = array(
--- a/tests/functional/extension_module_test.php
+++ b/tests/functional/extension_module_test.php
@ -17,8 +17,6 @@ require_once __DIR__ . '/../../phpBB/includes/acp/acp_modules.php';
 */
 class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;

 	protected static $fixtures = array(
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php
@ -16,8 +16,6 @@
 */
 class phpbb_functional_extension_permission_lang_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;

 	protected static $fixtures = array(
--- a/tests/functional/extension_template_event_order_test.php
+++ b/tests/functional/extension_template_event_order_test.php
@ -0,0 +1,105 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_extension_template_event_order_test extends phpbb_functional_test_case
+{
+	static private $helper;
+
+	static protected $fixtures = [
+		'./',
+	];
+
+	static public function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+
+		self::$helper = new phpbb_test_case_helpers(__CLASS__);
+		self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
+	}
+
+	static public function tearDownAfterClass(): void
+	{
+		parent::tearDownAfterClass();
+
+		self::$helper->restore_original_ext_dir();
+	}
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->purge_cache();
+	}
+
+	protected function tearDown(): void
+	{
+		$this->uninstall_ext('foo/bar');
+		$this->uninstall_ext('foo/foo');
+
+		parent::tearDown();
+	}
+
+	protected static function setup_extensions()
+	{
+		return ['foo/bar', 'foo/foo'];
+	}
+
+	/**
+	 * Check extensions template event listener prioritizing
+	 */
+	public function test_different_template_event_priority()
+	{
+		global $phpbb_root_path;
+
+		$crawler = self::request('GET', 'index.php');
+		$quick_links_menu = $crawler->filter('ul[role="menu"]')->eq(0);
+		$quick_links_menu_nodes_count = (int) $quick_links_menu->filter('li')->count();
+		// Ensure foo/foo template event goes before foo/bar one
+		$this->assertStringContainsString('FOO_FOO_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 4)->filter('span')->text());
+		$this->assertStringContainsString('FOO_BAR_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 3)->filter('span')->text());
+
+		// Change template events order to default, put foo/bar event before foo/foo one
+		$this->disable_ext('foo/bar');
+		$this->disable_ext('foo/foo');
+
+		$this->assertTrue(copy(__DIR__ . '/fixtures/ext/foo/bar/event/template_event_order_higher.php', $phpbb_root_path . 'ext/foo/bar/event/template_event_order.php'));
+		$this->assertTrue(copy(__DIR__ . '/fixtures/ext/foo/foo/event/template_event_order_lower.php', $phpbb_root_path . 'ext/foo/foo/event/template_event_order.php'));
+
+		$this->install_ext('foo/bar');
+		$this->install_ext('foo/foo');
+
+		$crawler = self::request('GET', 'index.php');
+		$quick_links_menu = $crawler->filter('ul[role="menu"]')->eq(0);
+		$quick_links_menu_nodes_count = (int) $quick_links_menu->filter('li')->count();
+		// Ensure foo/foo template event goes before foo/bar one
+		$this->assertStringContainsString('FOO_BAR_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 4)->filter('span')->text());
+		$this->assertStringContainsString('FOO_FOO_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 3)->filter('span')->text());
+	}
+
+	/**
+	 * Check extensions template event listener equal (default - 0) priority rendering
+	 * Should render in the order of reading listener files from the filesystem
+	 */
+	public function test_same_template_event_priority()
+	{
+		global $phpbb_root_path;
+
+		$crawler = self::request('GET', 'index.php');
+		// Ensure foo/bar template event goes before foo/foo one (assuming they have been read from the filesystem in alphabetical order)
+		$this->assertStringContainsString('FOO_BAR_FORUMLIST_BODY_BEFORE', $crawler->filter('p[id*="forumlist_body_before"]')->eq(0)->text());
+		$this->assertStringContainsString('FOO_FOO_FORUMLIST_BODY_BEFORE', $crawler->filter('p[id*="forumlist_body_before"]')->eq(1)->text());
+	}
+}
--- a/tests/functional/fixtures/ext/foo/bar/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
@ -14,7 +14,13 @@ services:
        class: foo\bar\event\permission
        tags:
            - { name: event.listener }
+
    foo_bar.listener.user_setup:
        class: foo\bar\event\user_setup
        tags:
            - { name: event.listener }
+
+    foo_bar.listener.template_event_order:
+        class: foo\bar\event\template_event_order
+        tags:
+            - { name: event.listener }
--- a/tests/functional/fixtures/ext/foo/bar/event/template_event_order.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/template_event_order.php
@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_bar'] = [
+			'event/navbar_header_quick_links_after' => -1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}
--- a/tests/functional/fixtures/ext/foo/bar/event/template_event_order_higher.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/template_event_order_higher.php
@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_bar'] = [
+			'event/navbar_header_quick_links_after' => 1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}
--- a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/index_body_forumlist_body_before.html
+++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/index_body_forumlist_body_before.html
@ -0,0 +1 @@
+<p id="foo_bar_forumlist_body_before">{{ lang('FOO_BAR_FORUMLIST_BODY_BEFORE') }}</p>
--- a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/navbar_header_quick_links_after.html
+++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/navbar_header_quick_links_after.html
@ -0,0 +1 @@
+<li><span>{{ lang('FOO_BAR_QUICK_LINK') }}</span></li>
--- a/tests/functional/fixtures/ext/foo/foo/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/foo/config/services.yml
@ -1,3 +1,8 @@
 services:
    foo_foo.controller:
        class: foo\foo\controller\controller
+
+    foo_foo.listener.template_event_order:
+        class: foo\foo\event\template_event_order
+        tags:
+            - { name: event.listener }
--- a/tests/functional/fixtures/ext/foo/foo/event/template_event_order.php
+++ b/tests/functional/fixtures/ext/foo/foo/event/template_event_order.php
@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\foo\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_foo'] = [
+			'event/navbar_header_quick_links_after' => 1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}
--- a/tests/functional/fixtures/ext/foo/foo/event/template_event_order_lower.php
+++ b/tests/functional/fixtures/ext/foo/foo/event/template_event_order_lower.php
@ -0,0 +1,38 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\foo\event;
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class template_event_order implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.twig_event_tokenparser_constructor'	=> 'set_template_event_priority',
+		);
+	}
+
+	public function set_template_event_priority($event)
+	{
+		$template_event_priority_array = $event['template_event_priority_array'];
+		$template_event_priority_array['foo_foo'] = [
+			'event/navbar_header_quick_links_after' => -1,
+		];
+		$event['template_event_priority_array'] = $template_event_priority_array;
+	}
+}
--- a/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/index_body_forumlist_body_before.html
+++ b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/index_body_forumlist_body_before.html
@ -0,0 +1 @@
+<p id="foo_foo_forumlist_body_before">{{ lang('FOO_FOO_FORUMLIST_BODY_BEFORE') }}</p>
--- a/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/navbar_header_quick_links_after.html
+++ b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/navbar_header_quick_links_after.html
@ -0,0 +1 @@
+<li><span>{{ lang('FOO_FOO_QUICK_LINK') }}</span></li>
--- a/tests/functional/metadata_manager_test.php
+++ b/tests/functional/metadata_manager_test.php
@ -16,8 +16,6 @@
 */
 class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 {
-	protected $phpbb_extension_manager;
-
 	private static $helper;

 	protected static $fixtures = array(
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@ -644,7 +644,7 @@ class phpbb_functional_test_case extends phpbb_test_case

 		$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');

-		// Wait for extension to be fully enabled
+		// Wait for extension to be fully disabled
 		while (count($meta_refresh))
 		{
 			preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match);
Author	SHA1	Message	Date
Matt Friedman	e53683cd21	Merge `b82d7d3f47` into `bc470285fc`	2025-06-15 00:05:55 -07:00
Marc Alexander	bc470285fc	Merge pull request #6770 from rxu/ticket/15214 [ticket/15214] Add event & functionality for assigning template event priority	2025-06-15 08:59:31 +02:00
rxu	1d7543c778	[ticket/15214] Address code review issues, add equal priority events test PHPBB3-15214	2025-06-15 01:35:31 +07:00
Matt Friedman	b82d7d3f47	[ticket/17517] Revert back to var PHPBB-17517	2025-06-01 09:45:57 -07:00
Matt Friedman	5553e7ae19	[ticket/17517] Clean up PHPBB-17517	2025-06-01 08:30:11 -07:00
Matt Friedman	7d50f40dde	[ticket/17517] Remove global ignore of extension’s JS files PHPBB-17517	2025-06-01 07:12:57 -07:00
Matt Friedman	2daabd34be	[ticket/17517] Refactor eslint config, remove unused rules PHPBB-17517	2025-05-31 13:26:44 -07:00
Matt Friedman	35a1af5a11	[ticket/17517] Fix handling of twig JS files too PHPBB-17517	2025-05-31 11:28:03 -07:00
Matt Friedman	216b71df9a	[ticket/17517] Update to latest eslint PHPBB-17517	2025-05-31 11:15:04 -07:00
Matt Friedman	1210c5a03d	[ticket/17517] Update ESLINT to 8.57.1 PHPBB-17517	2025-05-31 10:16:39 -07:00
Matt Friedman	1c0f1ed3da	[ticket/17517] Eslint all phpbb JS files PHPBB-17517	2025-05-31 10:13:10 -07:00
rxu	ccbdfb49c7	[ticket/15214] Adjust core event name and docblock PHPBB3-15214	2025-05-21 11:25:35 +07:00
rxu	43cf7b73bd	[ticket/15214] Adjust event node logic PHPBB3-15214	2025-05-21 10:47:27 +07:00
rxu	3a5247d01b	[ticket/15214] Get event dispatcher from environment rather than as dependency Also this will allow to significantly reduce unrelated tests changes. PHPBB3-15214	2025-05-20 17:36:15 +07:00
rxu	5e0dc9ef2e	[ticket/15214] Fix rebasing and some other issues PHPBB3-15214	2025-05-20 16:24:38 +07:00
rxu	8338ff9e56	[ticket/15214] Fix Windows tests PHPBB3-15214	2025-05-20 16:24:37 +07:00
toxyy	84e7e34a66	[ticket/15214] Fix tests again Adding per rxu's recommendation PHPBB3-15214	2025-05-20 16:24:37 +07:00
rxu	18bae795f0	[ticket/15214] Fix Windows tests Purge Twig compiled cache in Windows. Set appropriate folder access control options to do that. PHPBB3-15214	2025-05-20 16:24:36 +07:00
rxu	09fd86ffb0	[ticket/15214] Fix test foo/foo extension listener PHPBB3-15214	2025-05-20 16:24:34 +07:00
rxu	4a00212f2d	[ticket/15214] Optimize event node code and add template event order tests PHPBB3-15214	2025-05-20 16:24:34 +07:00
toxyy	cb47d78d26	[ticket/15214] Update block, restart tests Make docblock look a bit cleaner and restart the tests PHPBB3-15214	2025-05-20 16:24:33 +07:00
toxyy	0eb98d51e2	[ticket/15214] Provide usage example within event docblock Adds similar usage examples like the event core.permissions has PHPBB3-15214	2025-05-20 16:24:32 +07:00
toxyy	82a5e20f3e	[ticket/15214] Replace arrow functions with anonymous functions Arrow functions aren't added until PHP 7.4, so we can't use them yet. Anonymous functions have been added since PHP 5.3 PHPBB3-15214	2025-05-20 16:24:32 +07:00
toxyy	71fe9d60c4	[ticket/15214] Add fixes for various other tests Add new dispatch parameter to the template\twig\extension calls PHPBB3-15214	2025-05-20 16:24:31 +07:00
toxyy	59b482a222	[ticket/15214] Test fix for test_bbcode_firstpass Add new dispatch parameter to the template\twig\extension call PHPBB3-15214	2025-05-20 16:24:30 +07:00
toxyy	d934c8c4b7	[ticket/15214] Test fix for test_helper_url_no_rewrite Add new dispatch parameter to the template\twig\extension call PHPBB3-15214	2025-05-20 16:24:29 +07:00
toxyy	d07aeb00d8	[ticket/15214] Add event & functionality for assigning template event priority Event added to allow template events to be assigned priority per extension, event location chosen so that it only fires once. Twig node event class refactored to allow template event priority assignment, compile calls are deferred until all locations are processed per extension namespace. Priority precedence mirrors Symfony priority, with higher numbers being placed at the beginning of the array. Duplicate priority assignment will currently have the later events compiled before the others. PHPBB3-15214	2025-05-20 16:24:24 +07:00
				`@ -0,0 +1 @@`
				`<p id="foo_bar_forumlist_body_before">{{ lang('FOO_BAR_FORUMLIST_BODY_BEFORE') }}</p>`
				`@ -0,0 +1 @@`
				`<li><span>{{ lang('FOO_BAR_QUICK_LINK') }}</span></li>`
				`@ -0,0 +1 @@`
				`<p id="foo_foo_forumlist_body_before">{{ lang('FOO_FOO_FORUMLIST_BODY_BEFORE') }}</p>`
				`@ -0,0 +1 @@`
				`<li><span>{{ lang('FOO_FOO_QUICK_LINK') }}</span></li>`