From d42f03ce1da39dcb0433b566510fcdaf51ac7b26 Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Mon, 1 Apr 2024 17:01:05 -0500
Subject: [PATCH 01/13] ! its already an import/name-space so remove the
 redundant naming

---
 sources/ElkArte/BBC/BBCParser.php     |  8 ++++----
 sources/ElkArte/BBC/ParserWrapper.php | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sources/ElkArte/BBC/BBCParser.php b/sources/ElkArte/BBC/BBCParser.php
index 4634c90a28..bcdc588162 100644
--- a/sources/ElkArte/BBC/BBCParser.php
+++ b/sources/ElkArte/BBC/BBCParser.php
@@ -108,10 +108,10 @@ class BBCParser
 	/**
 	 * BBCParser constructor.
 	 *
-	 * @param \BBC\Codes $bbc
-	 * @param \BBC\Autolink|null $autolinker
-	 * @param \BBC\HtmlParser|null $html_parser
-	 * @param \BBC\MarkdownParser|null $markdown_parser
+	 * @param Codes $bbc
+	 * @param Autolink|null $autolinker
+	 * @param HtmlParser|null $html_parser
+	 * @param MarkdownParser|null $markdown_parser
 	 */
 	public function __construct(Codes $bbc, Autolink $autolinker = null, HtmlParser $html_parser = null, MarkdownParser $markdown_parser = null)
 	{
diff --git a/sources/ElkArte/BBC/ParserWrapper.php b/sources/ElkArte/BBC/ParserWrapper.php
index 61d9dff0c6..054d734c9e 100644
--- a/sources/ElkArte/BBC/ParserWrapper.php
+++ b/sources/ElkArte/BBC/ParserWrapper.php
@@ -23,22 +23,22 @@ final class ParserWrapper
 	/** @var array Disabled tags */
 	protected $disabled = array();
 
-	/** @var \BBC\Codes */
+	/** @var Codes */
 	protected $codes;
 
-	/** @var  \BBC\BBCParser */
+	/** @var  BBCParser */
 	protected $bbc_parser;
 
-	/** @var  \BBC\SmileyParser */
+	/** @var  SmileyParser */
 	protected $smiley_parser;
 
-	/** @var  \BBC\HtmlParser */
+	/** @var  HtmlParser */
 	protected $html_parser;
 
-	/** @var  \BBC\Autolink */
+	/** @var  Autolink */
 	protected $autolink_parser;
 
-	/** @var \BBC\MarkdownParser */
+	/** @var MarkdownParser */
 	protected $markdown_parser;
 
 	/** @var bool If smileys are enabled */

From 7eab47d15e3367c92beaa0c9ed384199d9029566 Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Mon, 1 Apr 2024 17:03:54 -0500
Subject: [PATCH 02/13] ! provide a drop-up option, useful for some menus

---
 themes/default/Display.template.php        |  2 +-
 themes/default/GenericHelpers.template.php |  5 +++--
 themes/default/css/_dark/index_dark.css    |  7 +++++++
 themes/default/css/_light/index_light.css  |  7 +++++++
 themes/default/css/index.css               | 19 +++++++++++++++++++
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/themes/default/Display.template.php b/themes/default/Display.template.php
index 2344a0db4c..82ddc52a71 100644
--- a/themes/default/Display.template.php
+++ b/themes/default/Display.template.php
@@ -242,7 +242,7 @@ function template_messages()
 		}
 
 		// Show the quickbuttons, for various operations on posts.
-		template_button_strip($message['postbuttons'], 'quickbuttons no_js', ['no-class' => true, 'id' => 'buttons_' . $message['id']]);
+		template_button_strip($message['postbuttons'], 'quickbuttons no_js', ['above' => true, 'no-class' => true, 'id' => 'buttons_' . $message['id']]);
 
 		echo '
 
diff --git a/themes/default/GenericHelpers.template.php b/themes/default/GenericHelpers.template.php
index f4fc900c32..bc5f172843 100644
--- a/themes/default/GenericHelpers.template.php
+++ b/themes/default/GenericHelpers.template.php
@@ -126,6 +126,7 @@ function template_select_boards($name, $label = '', $extra = '', $all = false)
  * @param array $strip_options = [] of options applied to the outer <UL>
  * 		'id' => id to use on the UL
  * 		'no-class' => do not apply the default "buttonlist no_js" to the ul (will still use passed $class)
+ *      'above' => turn dropdown sub-menu into a dropup sub-menu
  * @return void string as echoed content as buttons | submenu | checkbox
  */
 function template_button_strip($button_strip, $class = '', $strip_options = [])
@@ -203,11 +204,11 @@ function template_button_strip($button_strip, $class = '', $strip_options = [])
 	if (!empty($subMenu))
 	{
 		$buttons[] = '
-						<li class="listlevel1 subsections" role="none">
+						<li class="listlevel1 subsections' . (!empty($strip_options['above']) ? ' above"' : '"') . ' role="none">
 							<a aria-haspopup="true" role="menuitem" href="#" ' . (empty($options['use_click_menu']) ? 'onclick="event.stopPropagation();return false;"' : '') . ' class="linklevel1 post_options">' .
 								$txt['post_options'] . '
 							</a>
-							<ul role="menu" class="menulevel2">' . implode('', $subMenu) . '</ul>
+							<ul role="menu" class="menulevel2' . (!empty($strip_options['above']) ? ' above"' : '"') . '>' . implode('', $subMenu) . '</ul>
 						</li>';
 	}
 
diff --git a/themes/default/css/_dark/index_dark.css b/themes/default/css/_dark/index_dark.css
index 306ecedcea..285fd9bc0e 100644
--- a/themes/default/css/_dark/index_dark.css
+++ b/themes/default/css/_dark/index_dark.css
@@ -718,6 +718,13 @@ sup.bbc_footnotes, sup.bbc_footnotes a {
 	background: var(--menu_background);
 }
 
+/* Triangle pointer when the menu is above the pointer */
+.listlevel1.subsections.above::after {
+	border-color: var(--transparent);
+	border-bottom-color: var(--primary_border);
+	border-left-color: var(--primary_border);
+}
+
 .poster .linklevel2, .poster .linklevel2:focus,
 .poster .listlevel2:hover .linklevel2 {
 	border-color: var(--transparent);
diff --git a/themes/default/css/_light/index_light.css b/themes/default/css/_light/index_light.css
index 2fcc79634f..ad84be89b1 100644
--- a/themes/default/css/_light/index_light.css
+++ b/themes/default/css/_light/index_light.css
@@ -734,6 +734,13 @@ sup.bbc_footnotes, sup.bbc_footnotes a {
 	background: var(--primary_content_background);
 }
 
+/* Triangle pointer when the menu is above the pointer */
+.listlevel1.subsections.above::after {
+	border-color: var(--transparent);
+	border-bottom-color: var(--primary_border);
+	border-left-color: var(--primary_border);
+}
+
 .poster .linklevel2, .poster .linklevel2:focus,
 .poster .listlevel2:hover .linklevel2 {
 	border-color: var(--transparent);
diff --git a/themes/default/css/index.css b/themes/default/css/index.css
index 386ca46f49..c47981e483 100644
--- a/themes/default/css/index.css
+++ b/themes/default/css/index.css
@@ -1492,6 +1492,20 @@ a.bbc_link {
 	--pointersize: 12px;
 }
 
+/* turn the drop-down into a drop up menu */
+.menulevel2.above {
+	top: initial;
+	bottom: calc(100% + 4px);
+	transform-origin: bottom left;
+}
+
+.listlevel1.subsections.above::after {
+	top: initial;
+	bottom: calc(100% - (1.4142 * var(--pointersize)) / 2 + 6px);
+	/* Clips the top of the rotated square so it does not bleed into dropdown content */
+	clip-path: polygon(100% 100%, 100% 0%, 0% 0%, 0% 100%);
+}
+
 /* The next two show the menulevel 2/3 flyout and level1 pointer arrow
    Rotate Level 2 menu out of the page, sets visibility */
 .no_js .listlevel1:hover .menulevel2,
@@ -2822,6 +2836,11 @@ aside > .poster {
 	text-align: center;
 }
 
+/* to overcome the PM indicator when its on */
+.poster li.listlevel1:hover {
+	z-index: 20;
+}
+
 .poster .name {
 	font-size: var(--font17);
 	overflow: hidden;

From 96b3e0f757e2fe76956b57f46e633a260d0557ab Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Mon, 1 Apr 2024 17:04:47 -0500
Subject: [PATCH 03/13] ! re-escape tags in inline code blocks, needs to be
 extended further

---
 themes/default/scripts/elk_toolTips.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/themes/default/scripts/elk_toolTips.js b/themes/default/scripts/elk_toolTips.js
index 0a93044d61..3da1f4eca4 100644
--- a/themes/default/scripts/elk_toolTips.js
+++ b/themes/default/scripts/elk_toolTips.js
@@ -52,8 +52,8 @@ class SiteTooltip
 		{
 			let title = el.getAttribute('title');
 
-			el.setAttribute('data-title', title);
 			el.removeAttribute('title');
+			el.setAttribute('data-title', title);
 			el.addEventListener('mouseenter', this.showTooltip.bind(this));
 			el.addEventListener('mouseleave', this.hideTooltip.bind(this));
 		}
@@ -123,6 +123,16 @@ class SiteTooltip
 				// Load the tooltip content with our data-title
 				if (this.settings.tooltipContent === 'html')
 				{
+					// Regular expression to match content inside .bbc_code_inline span
+					let regex = new RegExp('(<span class="bbc_code_inline">).*?(<\/span>)', 's');
+
+					title = title.replace(regex, function(match, p1, p2)
+					{
+						let content = match.slice(p1.length, -p2.length);
+						let replacedContent = content.replace(/</g, "&lt;");
+						return p1 + replacedContent + p2;
+					});
+
 					tooltipText.innerHTML = title;
 				}
 				else

From 155a1d880e6b576fd3c61a0db40eb3bfe5083940 Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Tue, 2 Apr 2024 13:54:59 -0500
Subject: [PATCH 04/13] ! Fix #3677, do not reszie the preview when not asked

---
 sources/ElkArte/Controller/Attachment.php | 7 ++++---
 sources/ElkArte/IlaIntegrate.php          | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sources/ElkArte/Controller/Attachment.php b/sources/ElkArte/Controller/Attachment.php
index 142b9ac4ed..96940ce962 100644
--- a/sources/ElkArte/Controller/Attachment.php
+++ b/sources/ElkArte/Controller/Attachment.php
@@ -789,14 +789,15 @@ public function action_tmpattach()
 
 		$this->prepare_headers($filename, $eTag, $mime_type, 'inline', $real_filename, $do_cache);
 
-		if ($resize)
+		// do not resize for ;image
+		if ($resize && !isset($this->_req->query->ila, $this->_req->query->image))
 		{
 			// Create a thumbnail image
 			$image = new Image($filename);
 
 			$filename .= '_thumb';
-			$max_width = $this->_req->isSet('thumb') && !empty($modSettings['attachmentThumbWidth']) ? $modSettings['attachmentThumbWidth'] : 250;
-			$max_height = $this->_req->isSet('thumb') && !empty($modSettings['attachmentThumbHeight']) ? $modSettings['attachmentThumbHeight'] : 250;
+			$max_width = $this->_req->isSet('thumb') && !empty($modSettings['attachmentThumbWidth']) ? $modSettings['attachmentThumbWidth'] : 300;
+			$max_height = $this->_req->isSet('thumb') && !empty($modSettings['attachmentThumbHeight']) ? $modSettings['attachmentThumbHeight'] : 300;
 
 			$image->createThumbnail($max_width, $max_height, $filename, null, false);
 		}
diff --git a/sources/ElkArte/IlaIntegrate.php b/sources/ElkArte/IlaIntegrate.php
index bd468e66ea..9c92c2c902 100644
--- a/sources/ElkArte/IlaIntegrate.php
+++ b/sources/ElkArte/IlaIntegrate.php
@@ -302,7 +302,7 @@ public static function buildTag()
 				$alt = Util::htmlspecialchars($attachment['filename'] ?? 'X');
 				self::$typeTag = '
 					<a id="link_$1" data-lightboximage="$1" data-lightboxmessage="0" href="' . getUrl('action', ['action' => 'dlattach', 'attach' => '$1', 'image']) . '">
-						<img src="' . getUrl('action', ['action' => 'dlattach', 'attach' => '$1']) . $type . '" style="' . $style . '" alt="' . $alt . '" class="bbc_img ' . $class . '" loading="lazy" />
+						<img src="' . getUrl('action', ['action' => 'dlattach', 'attach' => '$1', 'ila' => '1']) . $type . '" style="' . $style . '" alt="' . $alt . '" class="bbc_img ' . $class . '" loading="lazy" />
 					</a>';
 			}
 			// Not an image, determine a mime thumbnail or use a default thumbnail
@@ -328,7 +328,7 @@ public static function buildTag()
 	}
 
 	/**
-	 * This is prevents a little repetition and provides a some control for url tags
+	 * This prevents a little repetition and provides a some control for url tags
 	 *
 	 * - Determines if the ILA is an image or not
 	 * - Keeps track of attachment usage to prevent displaying below the post

From b2b68093a2f896f35ddba4e5c42c6e1ae9739c00 Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Tue, 2 Apr 2024 13:55:44 -0500
Subject: [PATCH 05/13] ! make sure preview works in unread view

---
 sources/ElkArte/Controller/Unread.php |  3 +++
 themes/default/Recent.template.php    | 25 ++++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/sources/ElkArte/Controller/Unread.php b/sources/ElkArte/Controller/Unread.php
index a9a4dc5537..798f8c8545 100644
--- a/sources/ElkArte/Controller/Unread.php
+++ b/sources/ElkArte/Controller/Unread.php
@@ -129,6 +129,9 @@ public function pre_dispatch()
 		// If empty, no preview at all
 		if (!empty($modSettings['message_index_preview']))
 		{
+			loadJavascriptFile('elk_toolTips.js', ['defer' => true]);
+			$context['message_index_preview'] = true;
+
 			// If 0 means everything
 			if (empty($modSettings['preview_characters']))
 			{
diff --git a/themes/default/Recent.template.php b/themes/default/Recent.template.php
index 213b34d52f..6cca4ee121 100644
--- a/themes/default/Recent.template.php
+++ b/themes/default/Recent.template.php
@@ -233,13 +233,24 @@ function template_unread_below()
 
 		if (!empty($context['using_relative_time']))
 		{
-			echo '
-			<script type="module">
-				const topics = document.querySelectorAll(".topic_latest");
-				for (const topic of topics) {
-					topic.classList.add("relative");
-				}
-			</script>';
+			theme()->addInlineJavascript('
+				document.querySelectorAll(".topic_latest").forEach(element => element.classList.add("relative"));
+			', true);
+		}
+
+		// Message preview when enabled
+		if (!empty($context['message_index_preview']))
+		{
+			theme()->addInlineJavascript('
+			if ((!is_mobile && !is_touch) || use_click_menu) {
+				isFunctionLoaded("SiteTooltip").then((available) => {
+					if (available) {
+						let tooltip = new SiteTooltip();
+						tooltip.create(".preview");
+					}
+				});
+			};', true
+			);
 		}
 
 		echo '

From 0a2bba27d4f4c26e14767cd1870acbaf2225877d Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Tue, 2 Apr 2024 13:56:36 -0500
Subject: [PATCH 06/13] ! with year/month option, 10 years you run out of
 tinyint space

---
 install/install_2-0.php |  2 +-
 install/upgrade_2-0.php | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/install/install_2-0.php b/install/install_2-0.php
index 3edbb10fb2..cf5b4809c8 100644
--- a/install/install_2-0.php
+++ b/install/install_2-0.php
@@ -69,7 +69,7 @@ public function table_attachments()
 				array('name' => 'id_thumb', 'type' => 'int', 'size' => 10, 'unsigned' => true, 'default' => 0),
 				array('name' => 'id_msg', 'type' => 'int', 'size' => 10, 'unsigned' => true, 'default' => 0),
 				array('name' => 'id_member', 'type' => 'mediumint', 'size' => 8, 'unsigned' => true, 'default' => 0),
-				array('name' => 'id_folder', 'type' => 'tinyint', 'size' => 3, 'default' => 1),
+				array('name' => 'id_folder', 'type' => 'smallint', 'size' => 5, 'default' => 1),
 				array('name' => 'attachment_type', 'type' => 'tinyint', 'size' => 3, 'unsigned' => true, 'default' => 0),
 				array('name' => 'filename', 'type' => 'varchar', 'default' => '', 'size' => 255),
 				array('name' => 'file_hash', 'type' => 'varchar', 'default' => '', 'size' => 40),
diff --git a/install/upgrade_2-0.php b/install/upgrade_2-0.php
index 80c26d1acd..e9a5bd97d4 100644
--- a/install/upgrade_2-0.php
+++ b/install/upgrade_2-0.php
@@ -766,4 +766,28 @@ public function preparing_hideemail()
 			)
 		);
 	}
+
+	public function attachment_folder_column_title()
+	{
+		return 'Changing the attachment folder column to smallint.';
+	}
+
+	public function attachment_folder_column()
+	{
+		return array(
+			array(
+				'debug_title' => 'Changing the attachment folder column to smallint.',
+				'function' => function () {
+					$this->table->change_column('{db_prefix}attachments',
+						'id_folder',
+						array(
+							'type' => 'smallint',
+							'size' => 5,
+							'default' => 1
+						)
+					);
+				}
+			)
+		);
+	}
 }

From d99872456b2d2bd57121b76c91eb477be109f33b Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Tue, 2 Apr 2024 13:57:26 -0500
Subject: [PATCH 07/13] ! minor tweaks, mostly since css lint is off

---
 sources/ElkArte/Languages/Index/English.php |  2 +-
 themes/default/css/index.css                | 69 +++++++++++----------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/sources/ElkArte/Languages/Index/English.php b/sources/ElkArte/Languages/Index/English.php
index da13aeefeb..da3ab2a622 100644
--- a/sources/ElkArte/Languages/Index/English.php
+++ b/sources/ElkArte/Languages/Index/English.php
@@ -537,7 +537,7 @@
 $txt['topic_derived_from'] = 'Topic derived from %1$s';
 $txt['edit'] = 'Edit';
 $txt['quick_edit'] = 'Quick Edit';
-$txt['post_options'] = 'More...';
+$txt['post_options'] = 'Other Options';
 $txt['quote_expand'] = 'Show Quote';
 
 $txt['set_sticky'] = 'Pin';
diff --git a/themes/default/css/index.css b/themes/default/css/index.css
index c47981e483..ab1023c972 100644
--- a/themes/default/css/index.css
+++ b/themes/default/css/index.css
@@ -555,9 +555,9 @@ em, .em {
 }
 
 .nosel {
-	-webkit-user-select: none;
 	-moz-user-select: none;
 	-ms-user-select: none;
+	-webkit-user-select: none;
 	user-select: none;
 }
 
@@ -2315,10 +2315,10 @@ button[type="submit"].quick_quote_button.hide {
 
 .childboard_row {
 	font-size: var(--font13);
+	margin-top: .3em;
 	grid-column-start: info;
 	grid-column-end: end;
 	grid-row-start: children;
-	margin-top: .3em;
 }
 
 /* Styles for the grid content */
@@ -2549,17 +2549,17 @@ button[type="submit"].quick_quote_button.hide {
 /* Each li defined as a grid, since its single line could use flex here as well */
 .topic_listing > li {
 	display: grid;
-	grid-template-columns: [topic_icon] 50px [topic_info] auto [topic_latest] 350px [topic_stats] 150px [topic_moderation] 75px;
-	grid-template-rows: auto;
 	padding: .5em 0;
 	border: 1px solid;
+	grid-template-columns: [topic_icon] 50px [topic_info] auto [topic_latest] 350px [topic_stats] 150px [topic_moderation] 75px;
+	grid-template-rows: auto;
 }
 
 /* Container, holds the topic icon and fred */
 .topic_icons {
-	grid-column-start: topic_icon;
-	/* To keep an icon with fred aligned */
 	padding-left: 1em;
+	/* To keep an icon with fred aligned */
+	grid-column-start: topic_icon;
 	place-self: center left;
 }
 
@@ -2577,10 +2577,10 @@ button[type="submit"].quick_quote_button.hide {
 
 /* Container, holds topic name, starter, small page links and locked/sticky */
 .topic_info {
-	grid-column-start: topic_info;
 	margin: 0 0 0 .8em;
 	padding: .4em .8em .4em .8em;
 	border-right: 1px solid;
+	grid-column-start: topic_info;
 }
 
 .topic_name h4 {
@@ -2595,8 +2595,8 @@ button[type="submit"].quick_quote_button.hide {
 /* Container, Holds last poster and time, link to end */
 .topic_latest {
 	font-size: var(--font14);
-	grid-column-start: topic_latest;
 	white-space: nowrap;
+	grid-column-start: topic_latest;
 }
 
 .topic_latest .board_avatar {
@@ -2617,9 +2617,9 @@ button[type="submit"].quick_quote_button.hide {
 .topic_stats {
 	font-size: var(--font14);
 	line-height: 1.4;
-	grid-column-start: topic_stats;
 	padding: 0 .5em;
 	text-align: right;
+	grid-column-start: topic_stats;
 }
 
 /* Container, holds moderation checkbox or icons */
@@ -2809,9 +2809,9 @@ button[type="submit"].quick_quote_button.hide {
    items like <pre> from blowing out the grid */
 .post_wrapper {
 	display: grid;
+	padding-top: 1em;
 	grid-template-columns: [poster] 225px [postarea] minmax(0, auto);
 	grid-template-rows: [keyinfo] auto [messageContent] auto [attachments] auto [quickbuttons] auto [signature] auto;
-	padding-top: 1em;
 }
 
 aside > .poster {
@@ -2886,17 +2886,17 @@ aside > .poster {
 
 .poster_div_avatar {
 	align-self: center;
+	text-align: center;
 	justify-self: center;
 	grid-column: poster;
-	text-align: center;
 }
 
 .poster_div_details {
-	grid-column: details;
 	padding-right: 10px;
 	padding-left: 10px;
 	border-right: 1px solid;
 	border-left: 1px solid;
+	grid-column: details;
 }
 
 /* Information in the dropdown */
@@ -3020,10 +3020,10 @@ aside > .poster {
    This holds all data related to the post
    keyinfo -> messageContent -> attachments -> quickbuttons -> signature */
 .postarea {
+	padding: 0 1em 0 1.25em;
 	grid-column: postarea;
 	grid-row-start: keyinfo;
 	grid-row-end: footer;
-	padding: 0 1em 0 1.25em;
 }
 
 /* Area above the message, icon, reply number, date, subject */
@@ -3031,8 +3031,8 @@ aside > .poster {
 	font-size: var(--font13);
 	display: flex;
 	align-items: center;
-	grid-row: keyinfo;
 	padding: 1px 0 5px 0;
+	grid-row: keyinfo;
 }
 
 .keyinfo .post_subject {
@@ -3089,10 +3089,10 @@ aside > .poster {
 
 /* The actual message, what the entire software package is about */
 .messageContent {
-	grid-row: messageContent;
 	min-height: 70px;
 	padding: 1em 1em .25em .5em;
 	border-top: 1px solid;
+	grid-row: messageContent;
 	overflow-wrap: break-word;
 }
 
@@ -4108,9 +4108,9 @@ dl.merge_topic dd {
 .tooltip {
 	position: absolute;
 	top: 0;
+	right: 0;
 	bottom: 0;
 	left: 0;
-	right: 0;
 }
 
 /* -------------------------------------------------------
@@ -5041,10 +5041,10 @@ div.labels {
 /* Search results section, setup each li result as a grid */
 .search_results_posts > li {
 	display: grid;
-	grid-template-columns: auto 60px;
-	grid-template-rows: 60px auto auto;
 	padding: 0.5em 0;
 	border: 1px solid;
+	grid-template-columns: auto 60px;
+	grid-template-rows: 60px auto auto;
 }
 
 .search_results_posts .buttons {
@@ -5057,16 +5057,16 @@ div.labels {
 
 .search_results_posts .topic_details {
 	align-self: center;
-	grid-column-start: 1;
 	padding: 1em;
 	border-bottom: 0;
+	grid-column-start: 1;
 }
 
 .search_results_posts .topic_moderation {
 	align-self: center;
+	width: 80px;
 	justify-self: end;
 	grid-column-start: 2;
-	width: 80px;
 }
 
 .search_results_posts .topic_moderation input[type="checkbox"] {
@@ -5075,18 +5075,18 @@ div.labels {
 
 /* Shown when using show results as messages */
 .search_results_posts .quickbuttons {
+	margin: 0 1.5em;
 	grid-column-start: span 2;
 	grid-row-start: 3;
-	margin: 0 1.5em;
 }
 
 .search_results_posts .topic_body {
 	overflow: auto;
-	grid-column-start: span 2;
-	grid-row-start: 2;
 	margin: 0 1em 0;
 	padding: 1em 1em .5em 1em;
 	border-top: 1px solid;
+	grid-column-start: span 2;
+	grid-row-start: 2;
 }
 
 /* Use colored border to give gap between results */
@@ -5628,9 +5628,9 @@ div.labels {
 .like_stats_likers img, .like_stats_small_avatar {
 	width: 40px;
 	height: 40px;
-	object-fit: cover;
 	vertical-align: middle;
 	border-radius: 50%;
+	object-fit: cover;
 }
 
 /* -------------------------------------------------------
@@ -5675,6 +5675,7 @@ div.labels {
 .helpicon, a.helpicon {
 	margin: 0 .4em 0 0;
 	cursor: help;
+	vertical-align: text-bottom;
 }
 
 .chevricon {
@@ -5986,8 +5987,8 @@ div.labels {
 	.board_row .lastpost_link {
 		height: 48px;
 		max-height: 48px;
-		white-space: pre-wrap;
 		padding-top: 10px;
+		white-space: pre-wrap;
 	}
 
 	/* message listing */
@@ -6400,25 +6401,25 @@ div.labels {
 	/* Topic Listing */
 	#unread.topic_listing > li,
 	.topic_listing > li {
-		grid-template-columns: [topic_icon] 0 [topic_info] auto [topic_latest] 225px [topic_moderation] 10px [end];
-		grid-template-rows: [topic_info] auto [topic_latest] auto;
 		margin-bottom: .5em;
 		border: 1px solid;
+		grid-template-columns: [topic_icon] 0 [topic_info] auto [topic_latest] 225px [topic_moderation] 10px [end];
+		grid-template-rows: [topic_info] auto [topic_latest] auto;
 	}
 
 	.topic_info {
 		overflow: hidden;
+		padding: .5em 0;
 		grid-column-start: topic_info;
 		grid-column-end: end;
-		padding: .5em 0;
 	}
 
 	.topic_latest {
+		padding: 5px 0;
+		border-top: 1px solid;
 		grid-column-start: topic_info;
 		grid-column-end: topic_moderation;
 		grid-row-start: topic_latest;
-		padding: 5px 0;
-		border-top: 1px solid;
 	}
 
 	.sticky_row .topic_info::before, .locked_row .topic_info::before, .locked_row.sticky_row .topic_info::before {
@@ -6452,17 +6453,17 @@ div.labels {
 
 	.forumposts > aside {
 		display: flex;
+		border-bottom: 1px solid;
 		grid-column-start: poster;
 		grid-column-end: end;
 		grid-row-start: poster;
-		border-bottom: 1px solid;
 	}
 
 	.postarea {
+		margin: 0;
 		grid-column-start: poster;
 		grid-column-end: end;
 		grid-row-start: postarea;
-		margin: 0;
 	}
 
 	.small_pagelinks {
@@ -6780,16 +6781,16 @@ div.labels {
 	}
 
 	.category_boards .board_latest {
+		border-top: 1px solid;
 		grid-column-start: bicon;
 		grid-column-end: end;
 		grid-row-start: latest;
-		border-top: 1px solid;
 	}
 
 	.category_boards .board_icon {
+		height: 48px;
 		grid-column: bicon;
 		grid-row-start: primary;
-		height: 48px;
 	}
 
 	.board_description {

From 6952bccfe3e6cebc20a3dbf9e46b4cfc7959d7ca Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Tue, 2 Apr 2024 16:06:42 -0500
Subject: [PATCH 08/13] ! fix #3678 cant use += when array_merge is needed

---
 sources/ElkArte/Search/API/Custom.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/sources/ElkArte/Search/API/Custom.php b/sources/ElkArte/Search/API/Custom.php
index 8e0dfec12f..c9f0d4457c 100644
--- a/sources/ElkArte/Search/API/Custom.php
+++ b/sources/ElkArte/Search/API/Custom.php
@@ -28,10 +28,10 @@
 class Custom extends Standard
 {
 	/** @var string This is the last version of ElkArte that this was tested on, to protect against API changes. */
-	public $version_compatible = 'ElkArte 2.0 dev';
+	public $version_compatible = 'ElkArte 2.0';
 
 	/** @var string This won't work with versions of ElkArte less than this. */
-	public $min_elk_version = 'ElkArte 1.0 Beta';
+	public $min_elk_version = 'ElkArte 1.0';
 
 	/** @var bool Is it supported? */
 	public $is_supported = true;
@@ -63,7 +63,7 @@ public function __construct($config, $searchParams)
 
 		$this->indexSettings = Util::unserialize($modSettings['search_custom_index_config']);
 
-		$this->bannedWords = empty($modSettings['search_stopwords']) ? array() : explode(',', $modSettings['search_stopwords']);
+		$this->bannedWords = empty($modSettings['search_stopwords']) ? [] : explode(',', $modSettings['search_stopwords']);
 	}
 
 	/**
@@ -95,9 +95,11 @@ public function prepareIndexes($word, &$wordsSearch, &$wordsExclude, $isExcluded
 		{
 			return;
 		}
+
 		foreach ($subwords as $subword)
 		{
-			if (Util::strlen($subword) >= $this->min_word_length && !in_array($subword, $this->bannedWords))
+			if (Util::strlen($subword) >= $this->min_word_length
+				&& !in_array($subword, $this->bannedWords, true))
 			{
 				$wordsSearch['indexed_words'][] = $subword;
 				if ($isExcluded !== false)
@@ -135,9 +137,7 @@ public function indexedWordQuery($words, $search_data)
 		// We can't do anything without this
 		$db_search = db_search();
 
-		$query_select = array(
-			'id_msg' => 'm.id_msg',
-		);
+		$query_select = ['id_msg' => 'm.id_msg',];
 		$query_inner_join = [];
 		$query_left_join = [];
 		$query_where = [];
@@ -151,15 +151,15 @@ public function indexedWordQuery($words, $search_data)
 		$count = 0;
 		foreach ($words['words'] as $regularWord)
 		{
-			$query_where[] = 'm.body' . (in_array($regularWord, $query_params['excluded_words']) ? ' {not_' : '{') . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? 'ilike} ' : 'rlike} ') . '{string:complex_body_' . $count . '}';
+			$query_where[] = 'm.body' . (in_array($regularWord, $query_params['excluded_words'], true) ? ' {not_' : '{') . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? 'ilike} ' : 'rlike} ') . '{string:complex_body_' . $count . '}';
 			$query_params['complex_body_' . ($count++)] = $this->prepareWord($regularWord, $search_data['no_regexp']);
 		}
 
 		// Modifiers such as specific user or specific board.
-		$query_where += $this->queryWhereModifiers($query_params);
+		$query_where = array_merge($query_where, $this->queryWhereModifiers($query_params));
 
 		// Modifiers to exclude words from the subject
-		$query_where += $this->queryExclusionModifiers($query_params, $search_data);
+		$query_where = array_merge($query_where, $this->queryExclusionModifiers($query_params, $search_data));
 
 		$numTables = 0;
 		$prev_join = 0;
@@ -216,7 +216,7 @@ public function postCreated($msgOptions, $topicOptions, $posterOptions)
 		{
 			$db->insert('ignore',
 				'{db_prefix}log_search_words',
-				array('id_word' => 'int', 'id_msg' => 'int'),
+				['id_word' => 'int', 'id_msg' => 'int'],
 				$inserts,
 				['id_word', 'id_msg']
 			);

From 78cef3f574d614ee9dcccf569d590060abaeb33f Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Tue, 2 Apr 2024 16:08:41 -0500
Subject: [PATCH 09/13] ! bunch of [] and unnecessary qualifiers

---
 sources/ElkArte/Controller/Search.php       |  12 +-
 sources/ElkArte/Search/API/AbstractAPI.php  |  14 +-
 sources/ElkArte/Search/API/Fulltext.php     |  12 +-
 sources/ElkArte/Search/API/Sphinx.php       |  14 +-
 sources/ElkArte/Search/API/Sphinxql.php     |  10 +-
 sources/ElkArte/Search/API/Standard.php     | 147 ++++++++++----------
 sources/ElkArte/Search/Cache/Session.php    |   4 +-
 sources/ElkArte/Search/Search.php           |  83 +++++------
 sources/ElkArte/Search/SearchApiWrapper.php |  21 +--
 sources/ElkArte/Search/SearchArray.php      |  12 +-
 sources/ElkArte/Search/SearchParams.php     |  58 ++++----
 sources/ElkArte/Search/WeightFactors.php    |  70 +++++-----
 12 files changed, 234 insertions(+), 223 deletions(-)

diff --git a/sources/ElkArte/Controller/Search.php b/sources/ElkArte/Controller/Search.php
index 751102d85a..d039b8d628 100644
--- a/sources/ElkArte/Controller/Search.php
+++ b/sources/ElkArte/Controller/Search.php
@@ -42,7 +42,7 @@ class Search extends AbstractController
 	/** @var \ElkArte\Search\Search Holds the search object */
 	protected $_search;
 
-	/** @var null|\ElkArte\MessageTopicIcons The class that takes care of rendering the message icons */
+	/** @var null|MessageTopicIcons The class that takes care of rendering the message icons */
 	protected $_icon_sources;
 
 	/** @var array */
@@ -108,7 +108,7 @@ public function action_index()
 	 * - Decodes and loads search parameters given in the URL (if any).
 	 * - The form redirects to index.php?action=search;sa=results.
 	 *
-	 * @throws \ElkArte\Exceptions\Exception loadavg_search_disabled
+	 * @throws Exception loadavg_search_disabled
 	 * @uses Search template, searchform sub template
 	 *
 	 * @uses Search language file and Errors language when needed
@@ -211,7 +211,7 @@ public function action_search()
 		if (!empty($context['search_errors']))
 		{
 			Txt::load('Errors');
-			$context['search_errors']['messages'] = array();
+			$context['search_errors']['messages'] = [];
 			foreach ($context['search_errors'] as $search_error => $dummy)
 			{
 				if ($search_error === 'messages')
@@ -474,13 +474,13 @@ public function action_results()
 
 		try
 		{
-			$search_config = new ValuesContainer(array(
+			$search_config = new ValuesContainer([
 				'humungousTopicPosts' => $humungousTopicPosts,
 				'shortTopicPosts' => $shortTopicPosts,
 				'maxMessageResults' => $maxMessageResults,
 				'search_index' => empty($modSettings['search_index']) ? '' : $modSettings['search_index'],
-				'banned_words' => empty($modSettings['search_banned_words']) ? array() : explode(',', $modSettings['search_banned_words']),
-			));
+				'banned_words' => empty($modSettings['search_banned_words']) ? [] : explode(',', $modSettings['search_banned_words']),
+			]);
 			$context['topics'] = $this->_search->searchQuery(
 				new SearchApiWrapper($search_config, $this->_search->getSearchParams())
 			);
diff --git a/sources/ElkArte/Search/API/AbstractAPI.php b/sources/ElkArte/Search/API/AbstractAPI.php
index 8d6ec1826b..1c1daeac98 100644
--- a/sources/ElkArte/Search/API/AbstractAPI.php
+++ b/sources/ElkArte/Search/API/AbstractAPI.php
@@ -12,6 +12,8 @@
 
 namespace ElkArte\Search\API;
 
+use ElkArte\Database\AbstractSearch;
+use ElkArte\Database\QueryInterface;
 use ElkArte\Helper\HttpReq;
 use ElkArte\Helper\Util;
 use ElkArte\Helper\ValuesContainer;
@@ -66,13 +68,13 @@ abstract class AbstractAPI
 	/** @var array Phrases not to be found in the search results (-"some phrase") */
 	protected $_excludedPhrases = [];
 
-	/** @var \ElkArte\Database\QueryInterface Database instance */
+	/** @var QueryInterface Database instance */
 	protected $_db;
 
-	/** @var \ElkArte\Helper\HttpReq HttpReq instance */
+	/** @var HttpReq HttpReq instance */
 	protected $_req;
 
-	/** @var \ElkArte\Database\AbstractSearch Search db instance */
+	/** @var AbstractSearch Search db instance */
 	protected $_db_search;
 
 	/** @var array Words excluded from indexes */
@@ -200,8 +202,8 @@ public function getNumResults()
 	 */
 	public function searchSort($a, $b)
 	{
-		$x = Util::strlen($a) - (in_array($a, $this->_excludedWords) ? 1000 : 0);
-		$y = Util::strlen($b) - (in_array($b, $this->_excludedWords) ? 1000 : 0);
+		$x = Util::strlen($a) - (in_array($a, $this->_excludedWords, true) ? 1000 : 0);
+		$y = Util::strlen($b) - (in_array($b, $this->_excludedWords, true) ? 1000 : 0);
 
 		return $y < $x ? 1 : ($y > $x ? -1 : 0);
 	}
@@ -261,6 +263,6 @@ public function prepareWord($phrase, $no_regexp)
 	{
 		global $modSettings;
 
-		return empty($modSettings['search_match_words']) || $no_regexp ? '%' . strtr($phrase, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $phrase), '\\\'') . '[[:>:]]';
+		return empty($modSettings['search_match_words']) || $no_regexp ? '%' . strtr($phrase, ['_' => '\\_', '%' => '\\%']) . '%' : '[[:<:]]' . addcslashes(preg_replace(['/([\[\]$.+*?|{}()])/'], ['[$1]'], $phrase), '\\\'') . '[[:>:]]';
 	}
 }
diff --git a/sources/ElkArte/Search/API/Fulltext.php b/sources/ElkArte/Search/API/Fulltext.php
index 0ba492a575..e3508a8b03 100644
--- a/sources/ElkArte/Search/API/Fulltext.php
+++ b/sources/ElkArte/Search/API/Fulltext.php
@@ -27,7 +27,7 @@
 class Fulltext extends Standard
 {
 	/** @var string This is the last version of ElkArte that this was tested on, to protect against API changes. */
-	public $version_compatible = 'ElkArte 2.0 dev';
+	public $version_compatible = 'ElkArte 2.0';
 
 	/** @var string This won't work with versions of ElkArte less than this. */
 	public $min_elk_version = 'ElkArte 1.0';
@@ -42,7 +42,7 @@ class Fulltext extends Standard
 	protected $min_word_length = 4;
 
 	/** @var array What databases support the fulltext index? */
-	protected $supported_databases = array('MySQL');
+	protected $supported_databases = ['MySQL'];
 
 	/**
 	 * Fulltext::__construct()
@@ -79,9 +79,9 @@ protected function _getMinWordLength()
 		$request = $db_search->search_query('', '
 			SHOW VARIABLES
 			LIKE {string:fulltext_minimum_word_length}',
-			array(
+			[
 				'fulltext_minimum_word_length' => 'ft_min_word_len',
-			)
+			]
 		);
 		if ($request !== false && $request->num_rows() === 1)
 		{
@@ -104,7 +104,7 @@ public function prepareIndexes($word, &$wordsSearch, &$wordsExclude, $isExcluded
 	{
 		global $modSettings;
 
-		$subwords = text2words($word, false);
+		$subwords = text2words($word);
 
 		if (empty($modSettings['search_force_index']))
 		{
@@ -183,7 +183,7 @@ public function indexedWordQuery($words, $search_data)
 		{
 			foreach ($words['words'] as $regularWord)
 			{
-				$query_where[] = 'm.body' . (in_array($regularWord, $query_params['excluded_words']) ? ' {not_' : '{') . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? 'ilike} ' : 'rlike} ') . '{string:complex_body_' . $count . '}';
+				$query_where[] = 'm.body' . (in_array($regularWord, $query_params['excluded_words'], true) ? ' {not_' : '{') . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? 'ilike} ' : 'rlike} ') . '{string:complex_body_' . $count . '}';
 				$query_params['complex_body_' . ($count++)] = $this->prepareWord($regularWord, $search_data['no_regexp']);
 			}
 		}
diff --git a/sources/ElkArte/Search/API/Sphinx.php b/sources/ElkArte/Search/API/Sphinx.php
index 2b30fd77b7..5c8d1120b2 100644
--- a/sources/ElkArte/Search/API/Sphinx.php
+++ b/sources/ElkArte/Search/API/Sphinx.php
@@ -98,7 +98,7 @@ public function supportsExtended()
 	 */
 	public function prepareIndexes($word, &$wordsSearch, &$wordsExclude, $isExcluded, $excludedSubjectWords)
 	{
-		$subwords = text2words($word, false);
+		$subwords = text2words($word);
 
 		$fulltextWord = count($subwords) === 1 ? $word : '"' . $word . '"';
 		$wordsSearch['indexed_words'][] = $fulltextWord;
@@ -149,7 +149,7 @@ public function searchQuery($search_words, $excluded_words, &$participants)
 
 			// Update the field weights for subject vs body
 			$subject_weight = empty($modSettings['search_weight_subject']) ? 30 : (int) $modSettings['search_weight_subject'];
-			$mySphinx->SetFieldWeights(array('subject' => $subject_weight, 'body' => 100 - $subject_weight));
+			$mySphinx->SetFieldWeights(['subject' => $subject_weight, 'body' => 100 - $subject_weight]);
 
 			// Set the limits based on the search parameters.
 			$this->buildQueryLimits($mySphinx);
@@ -191,21 +191,21 @@ public function searchQuery($search_words, $excluded_words, &$participants)
 			}
 
 			// Get the relevant information from the search results.
-			$cached_results = array(
+			$cached_results = [
 				'matches' => [],
 				'num_results' => $request['total'],
-			);
+			];
 
 			if (isset($request['matches']))
 			{
 				foreach ($request['matches'] as $msgID => $match)
 				{
-					$cached_results['matches'][$msgID] = array(
+					$cached_results['matches'][$msgID] = [
 						'id' => $match['attrs']['id_topic'],
 						'relevance' => round($match['attrs']['@count'] + $match['attrs']['relevance'] / 5000, 1) . '%',
 						'num_matches' => empty($this->_searchParams->topic) ? $match['attrs']['@count'] : 0,
 						'matches' => [],
-					);
+					];
 				}
 			}
 
@@ -252,7 +252,7 @@ public function buildQueryLimits($mySphinx)
 
 		if (!empty($this->_searchParams->topic))
 		{
-			$mySphinx->SetFilter('id_topic', array((int) $this->_searchParams->topic));
+			$mySphinx->SetFilter('id_topic', [(int) $this->_searchParams->topic]);
 		}
 
 		if (!empty($this->_searchParams->brd))
diff --git a/sources/ElkArte/Search/API/Sphinxql.php b/sources/ElkArte/Search/API/Sphinxql.php
index c2b24b105c..23d2b0ddf3 100644
--- a/sources/ElkArte/Search/API/Sphinxql.php
+++ b/sources/ElkArte/Search/API/Sphinxql.php
@@ -20,6 +20,8 @@
 use ElkArte\Cache\Cache;
 use ElkArte\Errors\Errors;
 use ElkArte\User;
+use Exception;
+use mysqli;
 
 /**
  * SearchAPI-Sphinxql.class.php, SphinxQL API,
@@ -97,7 +99,7 @@ public function supportsExtended()
 	 */
 	public function prepareIndexes($word, &$wordsSearch, &$wordsExclude, $isExcluded, $excludedSubjectWords)
 	{
-		$subwords = text2words($word, false);
+		$subwords = text2words($word);
 
 		$fulltextWord = count($subwords) === 1 ? $word : '"' . $word . '"';
 		$wordsSearch['indexed_words'][] = $fulltextWord;
@@ -215,7 +217,7 @@ public function searchQuery($search_words, $excluded_words, &$participants)
 						'id' => $match['id_topic'],
 						'num_matches' => $num,
 						'matches' => [],
-						'relevance' => round($match['relevance'], 0),
+						'relevance' => round($match['relevance']),
 					];
 				}
 			}
@@ -245,7 +247,7 @@ public function searchQuery($search_words, $excluded_words, &$participants)
 	/**
 	 * Connect to the sphinx server, on failure log error and exit
 	 *
-	 * @return \mysqli
+	 * @return mysqli
 	 * @throws \ElkArte\Exceptions\Exception
 	 */
 	private function sphinxConnect()
@@ -257,7 +259,7 @@ private function sphinxConnect()
 		{
 			$mySphinx = mysqli_connect(($modSettings['sphinx_searchd_server'] === 'localhost' ? '127.0.0.1' : $modSettings['sphinx_searchd_server']), '', '', '', (int) $modSettings['sphinxql_searchd_port']);
 		}
-		catch (\Exception)
+		catch (Exception)
 		{
 			$mySphinx = false;
 		}
diff --git a/sources/ElkArte/Search/API/Standard.php b/sources/ElkArte/Search/API/Standard.php
index edd760d4ba..d7e95775b2 100644
--- a/sources/ElkArte/Search/API/Standard.php
+++ b/sources/ElkArte/Search/API/Standard.php
@@ -17,6 +17,7 @@
 namespace ElkArte\Search\API;
 
 use ElkArte\Search\Cache\Session;
+use Exception;
 
 /**
  * SearchAPI-Standard.class.php, Standard non-full index, non-custom index search
@@ -48,7 +49,7 @@ class Standard extends AbstractAPI
 	 * @param bool[] $participants
 	 *
 	 * @return array
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function searchQuery($search_words, $excluded_words, &$participants)
 	{
@@ -80,7 +81,7 @@ public function searchQuery($search_words, $excluded_words, &$participants)
 
 				if (empty($num_res))
 				{
-					throw new \Exception('query_not_specific_enough');
+					throw new Exception('query_not_specific_enough');
 				}
 			}
 
@@ -105,9 +106,9 @@ public function clearCacheResults($id_search)
 		$this->_db_search->search_query('', '
 			DELETE FROM {db_prefix}log_search_results
 			WHERE id_search = {int:search_id}',
-			array(
+			[
 				'search_id' => $id_search,
-			)
+			]
 		);
 	}
 
@@ -127,13 +128,13 @@ protected function getSubjectResults($id_search, $search_words, $excluded_words)
 		// We do this to try and avoid duplicate keys on databases not supporting INSERT IGNORE.
 		foreach ($search_words as $words)
 		{
-			$subject_query_params = array();
-			$subject_query = array(
+			$subject_query_params = [];
+			$subject_query = [
 				'from' => '{db_prefix}topics AS t',
-				'inner_join' => array(),
-				'left_join' => array(),
-				'where' => array(),
-			);
+				'inner_join' => [],
+				'left_join' => [],
+				'where' => [],
+			];
 
 			if ($modSettings['postmod_active'])
 			{
@@ -146,7 +147,7 @@ protected function getSubjectResults($id_search, $search_words, $excluded_words)
 			foreach ($words['subject_words'] as $subjectWord)
 			{
 				$numTables++;
-				if (in_array($subjectWord, $excluded_words))
+				if (in_array($subjectWord, $excluded_words, true))
 				{
 					$subject_query['left_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.word ' . (empty($modSettings['search_match_words']) ? '{ilike} {string:subject_words_' . $numTables . '_wild}' : '= {string:subject_words_' . $numTables . '}') . ' AND subj' . $numTables . '.id_topic = t.id_topic)';
 					$subject_query['where'][] = '(subj' . $numTables . '.word IS NULL)';
@@ -201,15 +202,15 @@ protected function getSubjectResults($id_search, $search_words, $excluded_words)
 			}
 
 			// Build the search query
-			$subject_query['select'] = array(
+			$subject_query['select'] = [
 				'id_search' => '{int:id_search}',
 				'id_topic' => 't.id_topic',
 				'relevance' => $this->_build_relevance(),
 				'id_msg' => empty($this->_searchParams->_userQuery) ? 't.id_first_msg' : 'm.id_msg',
 				'num_matches' => 1,
-			);
+			];
 
-			$subject_query['parameters'] = array_merge($subject_query_params, array(
+			$subject_query['parameters'] = array_merge($subject_query_params, [
 				'id_search' => $id_search,
 				'min_msg' => $this->_searchParams->_minMsg,
 				'recent_message' => $this->_searchParams->_recentMsg,
@@ -217,7 +218,7 @@ protected function getSubjectResults($id_search, $search_words, $excluded_words)
 				'short_topic_posts' => $this->config->shortTopicPosts,
 				'is_approved' => 1,
 				'limit' => empty($modSettings['search_max_results']) ? 0 : $modSettings['search_max_results'] - $numSubjectResults,
-			));
+			]);
 
 			call_integration_hook('integrate_subject_only_search_query', [&$subject_query, &$subject_query_params]);
 
@@ -358,7 +359,7 @@ private function _build_search_results_log($main_query, $query_identifier = '',
 				$usedIDs[$row['id_topic']] = true;
 				foreach ($row as $key => $value)
 				{
-					$inserts[$row['id_topic']][] = (int) $row[$key];
+					$inserts[$row['id_topic']][] = (int) $value;
 				}
 			}
 			$ignoreRequest->free_result();
@@ -399,27 +400,27 @@ public function getResults($id_search)
 
 		$num_results = 0;
 
-		$main_query = array(
-			'select' => array(
+		$main_query = [
+			'select' => [
 				'id_search' => $id_search,
 				'relevance' => '0',
-			),
+			],
 			'from' => '{db_prefix}topics AS t',
-			'inner_join' => array(
+			'inner_join' => [
 				'{db_prefix}messages AS m ON (m.id_topic = t.id_topic)'
-			),
+			],
 			'left_join' => [],
 			'where' => [],
 			'group_by' => [],
-			'parameters' => array(
+			'parameters' => [
 				'min_msg' => $this->_searchParams->_minMsg,
 				'recent_message' => $this->_searchParams->_recentMsg,
 				'huge_topic_posts' => $this->config->humungousTopicPosts,
 				'short_topic_posts' => $this->config->shortTopicPosts,
 				'is_approved' => 1,
 				'limit' => $modSettings['search_max_results'],
-			),
-		);
+			],
+		];
 
 		if (empty($this->_searchParams['topic']) && empty($this->_searchParams['show_complete']))
 		{
@@ -436,18 +437,18 @@ public function getResults($id_search)
 			$main_query['select']['id_msg'] = 'm.id_msg';
 			$main_query['select']['num_matches'] = '1 AS num_matches';
 
-			$main_query['weights'] = array(
-				'age' => array(
+			$main_query['weights'] = [
+				'age' => [
 					'search' => '((m.id_msg - t.id_first_msg) / CASE WHEN t.id_last_msg = t.id_first_msg THEN 1 ELSE t.id_last_msg - t.id_first_msg END)',
-				),
-				'first_message' => array(
+				],
+				'first_message' => [
 					'search' => 'CASE WHEN m.id_msg = t.id_first_msg THEN 1 ELSE 0 END',
-				),
+				],
 				// experimental, give longer messages more weight
-				'length' => array(
+				'length' => [
 					'search' => '(CASE WHEN LENGTH(m.body) - LENGTH(REPLACE(m.body, " ", "")) > 500 THEN 1 ELSE (LENGTH(m.body) - LENGTH(REPLACE(m.body, " ", "")) / 500) END)',
-				),
-			);
+				],
+			];
 
 			if (!empty($this->_searchParams['topic']))
 			{
@@ -506,7 +507,7 @@ public function getResults($id_search)
 				$where = [];
 				foreach ($words['all_words'] as $regularWord)
 				{
-					$where[] = 'm.body' . (in_array($regularWord, $excludedWords) ? ' {not_' : '{') . (empty($modSettings['search_match_words']) || $this->noRegexp() ? 'ilike} ' : 'rlike} ') . '{string:all_word_body_' . $count . '}';
+					$where[] = 'm.body' . (in_array($regularWord, $excludedWords, true) ? ' {not_' : '{') . (empty($modSettings['search_match_words']) || $this->noRegexp() ? 'ilike} ' : 'rlike} ') . '{string:all_word_body_' . $count . '}';
 					if (in_array($regularWord, $excludedWords, true))
 					{
 						$where[] = 'm.subject ' . (empty($modSettings['search_match_words']) || $this->noRegexp() ? ' {not_ilike} ' : ' {not_rlike} ') . '{string:all_word_body_' . $count . '}';
@@ -557,7 +558,7 @@ public function getResults($id_search)
 			}
 		}
 
-		call_integration_hook('integrate_main_search_query', array(&$main_query));
+		call_integration_hook('integrate_main_search_query', [&$main_query]);
 
 		// Did we either get some indexed results, or otherwise did not do an indexed query?
 		if (!empty($indexedResults) || !$this->useWordIndex())
@@ -569,30 +570,30 @@ public function getResults($id_search)
 		// Insert subject-only matches.
 		if ($num_results < $modSettings['search_max_results'] && $numSubjectResults !== 0)
 		{
-			$subject_query = array(
-				'select' => array(
+			$subject_query = [
+				'select' => [
 					'id_search' => '{int:id_search}',
 					'id_topic' => 't.id_topic',
 					'relevance' => $this->_build_relevance(),
 					'id_msg' => 't.id_first_msg',
 					'num_matches' => 1,
-				),
+				],
 				'from' => '{db_prefix}topics AS t',
-				'inner_join' => array(
+				'inner_join' => [
 					'{db_prefix}' . ($this->_createTemporary ? 'tmp_' : '') . 'log_search_topics AS lst ON (lst.id_topic = t.id_topic)'
-				),
-				'where' => array(
+				],
+				'where' => [
 					$this->_createTemporary ? '1=1' : 'lst.id_search = {int:id_search}',
-				),
-				'parameters' => array(
+				],
+				'parameters' => [
 					'id_search' => $id_search,
 					'min_msg' => $this->_searchParams->_minMsg,
 					'recent_message' => $this->_searchParams->_recentMsg,
 					'huge_topic_posts' => $this->config->humungousTopicPosts,
 					'short_topic_posts' => $this->config->shortTopicPosts,
 					'limit' => empty($modSettings['search_max_results']) ? 0 : $modSettings['search_max_results'] - $num_results,
-				),
-			);
+				],
+			];
 
 			$num_results += $this->_build_search_results_log($subject_query, 'insert_log_search_results_sub_only', true);
 		}
@@ -620,7 +621,7 @@ private function _log_search_subjects($id_search)
 			return 0;
 		}
 
-		$inserts = array();
+		$inserts = [];
 		$numSubjectResults = 0;
 
 		// Clean up some previous cache.
@@ -629,21 +630,21 @@ private function _log_search_subjects($id_search)
 			$this->_db_search->search_query('', '
 				DELETE FROM {db_prefix}log_search_topics
 				WHERE id_search = {int:search_id}',
-				array(
+				[
 					'search_id' => $id_search,
-				)
+				]
 			);
 		}
 
 		foreach ($this->_searchWords as $words)
 		{
-			$subject_query = array(
+			$subject_query = [
 				'from' => '{db_prefix}topics AS t',
-				'inner_join' => array(),
-				'left_join' => array(),
-				'where' => array(),
-				'params' => array(),
-			);
+				'inner_join' => [],
+				'left_join' => [],
+				'where' => [],
+				'params' => [],
+			];
 
 			$numTables = 0;
 			$prev_join = 0;
@@ -651,7 +652,7 @@ private function _log_search_subjects($id_search)
 			foreach ($words['subject_words'] as $subjectWord)
 			{
 				$numTables++;
-				if (in_array($subjectWord, $this->_excludedSubjectWords))
+				if (in_array($subjectWord, $this->_excludedSubjectWords, true))
 				{
 					$subject_query['inner_join'][] = '{db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)';
 					$subject_query['left_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.word ' . (empty($modSettings['search_match_words']) ? '{ilike} {string:subject_not_' . $count . '}' : '= {string:subject_not_' . $count . '}') . ' AND subj' . $numTables . '.id_topic = t.id_topic)';
@@ -713,7 +714,7 @@ private function _log_search_subjects($id_search)
 				}
 			}
 
-			call_integration_hook('integrate_subject_search_query', array(&$subject_query));
+			call_integration_hook('integrate_subject_search_query', [&$subject_query]);
 
 			// Nothing to search for?
 			if (empty($subject_query['where']))
@@ -778,9 +779,9 @@ private function _log_search_subjects($id_search)
 		{
 			$this->_db->insert('',
 				('{db_prefix}' . ($this->_createTemporary ? 'tmp_' : '') . 'log_search_topics'),
-				$this->_createTemporary ? array('id_topic' => 'int') : array('id_search' => 'int', 'id_topic' => 'int'),
+				$this->_createTemporary ? ['id_topic' => 'int'] : ['id_search' => 'int', 'id_topic' => 'int'],
 				$inserts,
-				$this->_createTemporary ? array('id_topic') : array('id_search', 'id_topic')
+				$this->_createTemporary ? ['id_topic'] : ['id_search', 'id_topic']
 			);
 		}
 
@@ -815,9 +816,9 @@ private function _prepare_word_index($id_search)
 			$this->_db_search->search_query('', '
 				DELETE FROM {db_prefix}log_search_messages
 				WHERE id_search = {int:id_search}',
-				array(
+				[
 					'id_search' => $id_search,
-				)
+				]
 			);
 		}
 
@@ -829,24 +830,24 @@ private function _prepare_word_index($id_search)
 			if (!empty($words['indexed_words']))
 			{
 				// Variables required for the search.
-				$search_data = array(
+				$search_data = [
 					'insert_into' => ($this->_createTemporary ? 'tmp_' : '') . 'log_search_messages',
 					'no_regexp' => $this->noRegexp(),
 					'max_results' => $this->config->maxMessageResults,
 					'indexed_results' => $indexedResults,
-					'params' => array(
+					'params' => [
 						'id_search' => $this->_createTemporary ? 0 : $id_search,
 						'excluded_words' => $excludedWords,
 						'user_query' => empty($this->_searchParams->_userQuery) ? '' : $this->_searchParams->_userQuery,
 						'board_query' => empty($this->_searchParams->_boardQuery) ? '' : $this->_searchParams->_boardQuery,
 						'topic' => (int) $this->_searchParams->topic,
-						'min_msg_id' => (int) $this->_searchParams->_minMsgID,
-						'max_msg_id' => (int) $this->_searchParams->_maxMsgID,
+						'min_msg_id' => $this->_searchParams->_minMsgID,
+						'max_msg_id' => $this->_searchParams->_maxMsgID,
 						'excluded_phrases' => $this->_excludedPhrases,
 						'excluded_index_words' => $this->_excludedIndexWords,
 						'excluded_subject_words' => $this->_excludedSubjectWords,
-					),
-				);
+					],
+				];
 
 				$ignoreRequest = $this->indexedWordQuery($words, $search_data);
 
@@ -883,9 +884,9 @@ private function _prepare_word_index($id_search)
 		{
 			$this->_db->insert('',
 				'{db_prefix}' . ($this->_createTemporary ? 'tmp_' : '') . 'log_search_messages',
-				$this->_createTemporary ? array('id_msg' => 'int') : array('id_msg' => 'int', 'id_search' => 'int'),
+				$this->_createTemporary ? ['id_msg' => 'int'] : ['id_msg' => 'int', 'id_search' => 'int'],
 				$inserts,
-				$this->_createTemporary ? array('id_msg') : array('id_msg', 'id_search')
+				$this->_createTemporary ? ['id_msg'] : ['id_msg', 'id_search']
 			);
 		}
 
@@ -912,7 +913,7 @@ public function indexedWordQuery($words, $search_data)
 	public function addRelevance(&$topics, $id_search, $start, $limit)
 	{
 		// *** Retrieve the results to be shown on the page
-		$participants = array();
+		$participants = [];
 		$request = $this->_db_search->search_query('', '
 			SELECT ' .
 			(empty($this->_searchParams['topic']) ? 'lsr.id_topic' : $this->_searchParams->topic . ' AS id_topic') . ',
@@ -922,21 +923,21 @@ public function addRelevance(&$topics, $id_search, $start, $limit)
 			WHERE lsr.id_search = {int:id_search}
 			ORDER BY {raw:sort} {raw:sort_dir}
 			LIMIT {int:limit} OFFSET {int:start}',
-			array(
+			[
 				'id_search' => $id_search,
 				'sort' => $this->_searchParams->sort,
 				'sort_dir' => $this->_searchParams->sort_dir,
 				'start' => $start,
 				'limit' => $limit,
-			)
+			]
 		);
 		while (($row = $request->fetch_assoc()))
 		{
-			$topics[$row['id_msg']] = array(
+			$topics[$row['id_msg']] = [
 				'relevance' => round($row['relevance'] / 10, 1) . '%',
 				'num_matches' => $row['num_matches'],
-				'matches' => array(),
-			);
+				'matches' => [],
+			];
 			// By default they didn't participate in the topic!
 			$participants[$row['id_topic']] = false;
 		}
diff --git a/sources/ElkArte/Search/Cache/Session.php b/sources/ElkArte/Search/Cache/Session.php
index c0ce2ccbfe..26af2ae513 100644
--- a/sources/ElkArte/Search/Cache/Session.php
+++ b/sources/ElkArte/Search/Cache/Session.php
@@ -57,11 +57,11 @@ public function __construct($index = '')
 	 */
 	public function __destruct()
 	{
-		new SessionIndex($this->_session_index, array(
+		new SessionIndex($this->_session_index, [
 			'id_search' => $this->_id_search,
 			'num_results' => $this->_num_results,
 			'params' => $this->_params,
-		));
+		]);
 	}
 
 	/**
diff --git a/sources/ElkArte/Search/Search.php b/sources/ElkArte/Search/Search.php
index 79d5441917..a35d6081aa 100644
--- a/sources/ElkArte/Search/Search.php
+++ b/sources/ElkArte/Search/Search.php
@@ -17,6 +17,7 @@
 namespace ElkArte\Search;
 
 use ElkArte\Database\AbstractResult;
+use ElkArte\Database\QueryInterface;
 use ElkArte\Search\API\Standard;
 
 /**
@@ -30,16 +31,16 @@ class Search
 	/** @var array */
 	protected $_participants = [];
 
-	/** @var \ElkArte\Search\SearchParams */
+	/** @var SearchParams */
 	protected $_searchParams;
 
-	/** @var \ElkArte\Search\SearchArray Holds the words and phrases to be searched on */
+	/** @var SearchArray Holds the words and phrases to be searched on */
 	private $_searchArray;
 
 	/** @var null|object Holds instance of the search api in use such as \ElkArte\Search\API\Standard_Search */
 	private $_searchAPI;
 
-	/** @var \ElkArte\Database\QueryInterface Database instance */
+	/** @var QueryInterface Database instance */
 	private $_db;
 
 	/** @var array Builds the array of words for use in the db query */
@@ -54,7 +55,7 @@ class Search
 	/** @var array Phrases not to be found in the search results (-"some phrase") */
 	private $_excludedPhrases = [];
 
-	/** @var \ElkArte\Search\WeightFactors The weights to associate to various areas for relevancy */
+	/** @var WeightFactors The weights to associate to various areas for relevancy */
 	private $_weightFactors = [];
 
 	/** @var bool If we are creating a tmp db table */
@@ -79,43 +80,43 @@ public function __construct()
 
 		$this->_createTemporary = $db_search->createTemporaryTable(
 				'{db_prefix}tmp_log_search_messages',
-				array(
-					array(
+				[
+					[
 						'name' => 'id_msg',
 						'type' => 'int',
 						'size' => 10,
 						'unsigned' => true,
 						'default' => 0,
-					)
-				),
-				array(
-					array(
+					]
+				],
+				[
+					[
 						'name' => 'id_msg',
-						'columns' => array('id_msg'),
+						'columns' => ['id_msg'],
 						'type' => 'primary'
-					)
-				)
+					]
+				]
 			) !== false;
 
 		// Skip the error as it is not uncommon for temp tables to be denied
 		$db_search->skip_next_error();
 		$db_search->createTemporaryTable('{db_prefix}tmp_log_search_topics',
-			array(
-				array(
+			[
+				[
 					'name' => 'id_topic',
 					'type' => 'mediumint',
 					'unsigned' => true,
 					'size' => 8,
 					'default' => 0
-				)
-			),
-			array(
-				array(
+				]
+			],
+			[
+				[
 					'name' => 'id_topic',
-					'columns' => array('id_topic'),
+					'columns' => ['id_topic'],
 					'type' => 'primary'
-				)
-			)
+				]
+			]
 		);
 	}
 
@@ -136,11 +137,11 @@ public function param($name)
 	 */
 	public function getParams()
 	{
-		$this->_searchParams->mergeWith(array(
-			'min_msg_id' => (int) $this->_searchParams->_minMsgID,
-			'max_msg_id' => (int) $this->_searchParams->_maxMsgID,
+		$this->_searchParams->mergeWith([
+			'min_msg_id' => $this->_searchParams->_minMsgID,
+			'max_msg_id' => $this->_searchParams->_maxMsgID,
 			'memberlist' => $this->_searchParams->_memberlist,
-		));
+		]);
 	}
 
 	/**
@@ -154,7 +155,7 @@ public function getIgnored()
 	/**
 	 * Set the weight factors
 	 *
-	 * @param \ElkArte\Search\WeightFactors $weight
+	 * @param WeightFactors $weight
 	 */
 	public function setWeights($weight)
 	{
@@ -164,7 +165,7 @@ public function setWeights($weight)
 	/**
 	 * Set disallowed words etc.
 	 *
-	 * @param \ElkArte\Search\SearchParams $paramObject
+	 * @param SearchParams $paramObject
 	 * @param false $search_simple_fulltext
 	 */
 	public function setParams($paramObject, $search_simple_fulltext = false)
@@ -206,8 +207,8 @@ public function setBlockListedWords()
 	{
 		// Unfortunately, searching for words like these is going to result in to many hits,
 		// so we're blocking them.
-		$blocklist_words = array('img', 'url', 'quote', 'www', 'http', 'the', 'is', 'it', 'are', 'if', 'in');
-		call_integration_hook('integrate_search_blocklist_words', array(&$blocklist_words));
+		$blocklist_words = ['img', 'url', 'quote', 'www', 'http', 'the', 'is', 'it', 'are', 'if', 'in'];
+		call_integration_hook('integrate_search_blocklist_words', [&$blocklist_words]);
 
 		$this->_blocklist_words = $blocklist_words;
 	}
@@ -247,7 +248,7 @@ public function getExcludedSubjectWords()
 	 *
 	 * @param bool $array If true returns an array, otherwise an object
 	 *
-	 * @return \ElkArte\Search\SearchParams|string[]
+	 * @return SearchParams|string[]
 	 */
 	public function getSearchParams($array = false)
 	{
@@ -284,7 +285,7 @@ public function isCompact()
 	 *
 	 * @return string - the encoded string to be appended to the URL
 	 */
-	public function compileURLparams($search = array())
+	public function compileURLparams($search = [])
 	{
 		return $this->_searchParams->compileURL($search);
 	}
@@ -293,14 +294,14 @@ public function compileURLparams($search = array())
 	 * Finds the posters of the messages
 	 *
 	 * @param int[] $msg_list - All the messages we want to find the posters
-	 * @param int $limit - There are only so much topics
+	 * @param int $limit - There are only so many topics
 	 *
 	 * @return int[] - array of members id
 	 */
 	public function loadPosters($msg_list, $limit)
 	{
 		// Load the posters...
-		$posters = array();
+		$posters = [];
 		$this->_db->fetchQuery('
 			SELECT
 				id_member
@@ -308,14 +309,14 @@ public function loadPosters($msg_list, $limit)
 			WHERE id_member != {int:no_member}
 				AND id_msg IN ({array_int:message_list})
 			LIMIT {int:limit}',
-			array(
+			[
 				'message_list' => $msg_list,
 				'limit' => $limit,
 				'no_member' => 0,
-			)
+			]
 		)->fetch_callback(
 			static function ($row) use (&$posters) {
-				$posters[] = $row['id_member'];
+				$posters[] = (int) $row['id_member'];
 			}
 		);
 
@@ -326,7 +327,7 @@ static function ($row) use (&$posters) {
 	 * Finds the posters of the messages
 	 *
 	 * @param int[] $msg_list - All the messages we want to find the posters
-	 * @param int $limit - There are only so much topics
+	 * @param int $limit - There are only so many topics
 	 *
 	 * @return bool|AbstractResult
 	 */
@@ -360,12 +361,12 @@ public function loadMessagesRequest($msg_list, $limit)
 				AND m.approved = {int:is_approved}' : '') . '
 			ORDER BY FIND_IN_SET(m.id_msg, {string:message_list_in_set})
 			LIMIT {int:limit}',
-			array(
+			[
 				'message_list' => $msg_list,
 				'is_approved' => 1,
 				'message_list_in_set' => implode(',', $msg_list),
 				'limit' => $limit,
-			)
+			]
 		);
 	}
 
@@ -456,7 +457,7 @@ public function searchWords()
 			$this->_searchAPI->setExcludedWords($excludedWords);
 
 			// Sort the indexed words (large words -> small words -> excluded words).
-			usort($orParts[$orIndex], array($this->_searchAPI, 'searchSort'));
+			usort($orParts[$orIndex], [$this->_searchAPI, 'searchSort']);
 
 			foreach ($orParts[$orIndex] as $word)
 			{
diff --git a/sources/ElkArte/Search/SearchApiWrapper.php b/sources/ElkArte/Search/SearchApiWrapper.php
index 3a668eb71f..47f164bb32 100644
--- a/sources/ElkArte/Search/SearchApiWrapper.php
+++ b/sources/ElkArte/Search/SearchApiWrapper.php
@@ -19,6 +19,7 @@
 use ElkArte\Errors\Errors;
 use ElkArte\Helper\ValuesContainer;
 use ElkArte\Languages\Txt;
+use ElkArte\Search\API\AbstractAPI;
 
 /**
  * Actually do the searches
@@ -34,7 +35,7 @@ class SearchApiWrapper
 	/**
 	 * Constructor
 	 *
-	 * @param \ElkArte\Helper\ValuesContainer|string $config The searchAPI
+	 * @param ValuesContainer|string $config The searchAPI
 	 * @param SearchParams $searchParams
 	 * @package Search
 	 */
@@ -51,7 +52,7 @@ public function __construct($config, $searchParams = null)
 	/**
 	 * Creates a search API and returns the object.
 	 *
-	 * @param \ElkArte\Helper\ValuesContainer $config
+	 * @param ValuesContainer $config
 	 * @param SearchParams $searchParams
 	 */
 	protected function load($config, $searchParams)
@@ -71,7 +72,7 @@ protected function load($config, $searchParams)
 		// Try to initialize the API
 		$fqcn = '\\ElkArte\\Search\\API\\' . ucfirst($searchClass);
 
-		if (class_exists($fqcn) && is_a($fqcn, '\\ElkArte\\Search\\API\\AbstractAPI', true))
+		if (class_exists($fqcn) && is_a($fqcn, AbstractAPI::class, true))
 		{
 			// Create an instance of the search API and check it is valid for this version of the software.
 			$this->_searchAPI = new $fqcn($config, $searchParams);
@@ -97,7 +98,7 @@ protected function load($config, $searchParams)
 	 */
 	public function postCreated($msgOptions, $topicOptions, $posterOptions)
 	{
-		if (is_callable(array($this->_searchAPI, 'postCreated')))
+		if (is_callable([$this->_searchAPI, 'postCreated']))
 		{
 			$this->_searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
 		}
@@ -112,7 +113,7 @@ public function postCreated($msgOptions, $topicOptions, $posterOptions)
 	 */
 	public function postModified($msgOptions, $topicOptions, $posterOptions)
 	{
-		if (is_callable(array($this->_searchAPI, 'postModified')))
+		if (is_callable([$this->_searchAPI, 'postModified']))
 		{
 			$this->_searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
 		}
@@ -126,7 +127,7 @@ public function postModified($msgOptions, $topicOptions, $posterOptions)
 	 */
 	public function topicSplit($split2_ID_TOPIC, $splitMessages)
 	{
-		if (is_callable(array($this->_searchAPI, 'topicSplit')))
+		if (is_callable([$this->_searchAPI, 'topicSplit']))
 		{
 			$this->_searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages);
 		}
@@ -142,7 +143,7 @@ public function topicSplit($split2_ID_TOPIC, $splitMessages)
 	 */
 	public function topicMerge($id_topic, $topics, $affected_msgs, $subject)
 	{
-		if (is_callable(array($this->_searchAPI, 'topicMerge')))
+		if (is_callable([$this->_searchAPI, 'topicMerge']))
 		{
 			$this->_searchAPI->topicMerge($id_topic, $topics, $affected_msgs, $subject);
 		}
@@ -155,7 +156,7 @@ public function topicMerge($id_topic, $topics, $affected_msgs, $subject)
 	 */
 	public function searchSettings(&$config_vars)
 	{
-		if (is_callable(array($this->_searchAPI, 'searchSettings')))
+		if (is_callable([$this->_searchAPI, 'searchSettings']))
 		{
 			$this->_searchAPI->searchSettings($config_vars);
 		}
@@ -216,7 +217,7 @@ public function setExcludedWords($words)
 	/**
 	 * Wrapper for setSearchArray of the SearchAPI
 	 *
-	 * @param \ElkArte\Search\SearchArray $searchArray
+	 * @param SearchArray $searchArray
 	 */
 	public function setSearchArray(SearchArray $searchArray)
 	{
@@ -252,7 +253,7 @@ public function searchSort($a, $b)
 	/**
 	 * Wrapper for setWeightFactors of the SearchAPI
 	 *
-	 * @param \ElkArte\Search\WeightFactors $weights
+	 * @param WeightFactors $weights
 	 */
 	public function setWeightFactors(WeightFactors $weights)
 	{
diff --git a/sources/ElkArte/Search/SearchArray.php b/sources/ElkArte/Search/SearchArray.php
index 00c2ca3310..1025820825 100644
--- a/sources/ElkArte/Search/SearchArray.php
+++ b/sources/ElkArte/Search/SearchArray.php
@@ -52,9 +52,9 @@ public function __construct(protected $_search_string, private $_blocklist_words
 		parent::__construct();
 
 		// Build the search query appropriate for the API in use
-		$search_config = new ValuesContainer(array(
+		$search_config = new ValuesContainer([
 			'search_index' => $this->_modSettings['search_index'] ?: '',
-		));
+		]);
 		$searchAPI = new SearchApiWrapper($search_config);
 		$searchAPI->supportsExtended() ? $this->searchArrayExtended() : $this->searchArray();
 		unset($searchAPI);
@@ -73,7 +73,7 @@ protected function searchArray()
 		// This option will do fulltext searching in the most basic way.
 		if ($this->_search_simple_fulltext)
 		{
-			$stripped_query = strtr($stripped_query, array('"' => ''));
+			$stripped_query = strtr($stripped_query, ['"' => '']);
 		}
 
 		$this->_no_regexp = preg_match('~&#(?:\d{1,7}|x[0-9a-fA-F]{1,6});~', $stripped_query) === 1;
@@ -155,7 +155,7 @@ private function _checkExcludePhrase($matches, $phraseArray)
 	/**
 	 * Looks for words that should be excluded in the results (-word)
 	 *
-	 * - Look for -test, etc
+	 * - Look for -test, etc.
 	 * - Prevents excluding blocklist words since it is redundant
 	 *
 	 * @param string[] $wordArray
@@ -184,13 +184,13 @@ private function _checkExcludeWord($wordArray)
 	 * Constructs a binary mode query to pass back to a search API
 	 *
 	 * Understands the use of OR | AND & as search modifiers
-	 * Currently used by the sphinx API's
+	 * Currently used by the sphinx API
 	 *
 	 * @return string
 	 */
 	public function searchArrayExtended()
 	{
-		$keywords = array('include' => [], 'exclude' => []);
+		$keywords = ['include' => [], 'exclude' => []];
 
 		// Split our search string and return an empty string if no matches
 		if (!preg_match_all('~(-?)("[^"]+"|[^" ]+)~', $this->_search_string, $tokens, PREG_SET_ORDER))
diff --git a/sources/ElkArte/Search/SearchParams.php b/sources/ElkArte/Search/SearchParams.php
index c455d06721..8eb7f04758 100644
--- a/sources/ElkArte/Search/SearchParams.php
+++ b/sources/ElkArte/Search/SearchParams.php
@@ -53,7 +53,7 @@ class SearchParams extends ValuesContainer
 	/** @var QueryInterface|null */
 	protected $_db;
 
-	/** @var \ElkArte\Helper\HttpReq HttpReq instance */
+	/** @var HttpReq HttpReq instance */
 	protected $_req;
 
 	/**
@@ -84,7 +84,7 @@ public function __construct(protected $_search_string)
 	protected function prepare()
 	{
 		// Due to IE's 2083 character limit, we have to compress long search strings
-		$temp_params = base64_decode(str_replace(array('-', '_', '.'), array('+', '/', '='), $this->_search_string));
+		$temp_params = base64_decode(str_replace(['-', '_', '.'], ['+', '/', '='], $this->_search_string));
 
 		// Test for gzuncompress failing, our ErrorException will die on any E_WARNING with no
 		// Exception, so turn it off/on for this check.
@@ -188,11 +188,11 @@ public function merge($params, $recentPercentage, $maxMembersToSearch)
 		$this->setSortAndDirection($params);
 
 		// Determine some values needed to calculate the relevance.
-		$this->_minMsg = (int) ((1 - $recentPercentage) * $modSettings['maxMsgID']);
+		$this->_minMsg = (int) ceil((1 - $recentPercentage) * $modSettings['maxMsgID']);
 		$this->_recentMsg = $modSettings['maxMsgID'] - $this->_minMsg;
 
 		// *** Parse the search query
-		call_integration_hook('integrate_search_params', array(&$this->_search_params));
+		call_integration_hook('integrate_search_params', [&$this->_search_params]);
 
 		// What are we searching for?
 		$this->_search_params['search'] = $this->setSearchTerm();
@@ -211,7 +211,7 @@ public function cleanParams(&$params)
 		$params['minage'] = $this->daysBetween($params['minage'] ?? null, 0);
 		$params['maxage'] = $this->daysBetween($params['maxage'] ?? null, 9999);
 
-		$validator->sanitation_rules(array(
+		$validator->sanitation_rules([
 			'advanced' => 'intval',
 			'searchtype' => 'intval',
 			'minage' => 'intval',
@@ -224,11 +224,11 @@ public function cleanParams(&$params)
 			'sort' => 'trim',
 			'show_complete' => 'boolval',
 			'sd_brd' => 'intval'
-		));
-		$validator->input_processing(array(
+		]);
+		$validator->input_processing([
 			'brd' => 'array',
 			'sd_brd' => 'array'
-		));
+		]);
 		$validator->validate($params);
 
 		$params = array_replace((array) $params, $validator->validation_data());
@@ -302,13 +302,15 @@ private function getMinMaxLimits()
 				AND approved = {int:is_approved_true}' : '') . (empty($this->_search_params['minage']) ? '' : '
 				AND poster_time <= {int:timestamp_minimum_age}') . (empty($this->_search_params['maxage']) ? '' : '
 				AND poster_time >= {int:timestamp_maximum_age}'),
-			array(
+			[
 				'timestamp_minimum_age' => empty($this->_search_params['minage']) ? 0 : time() - 86400 * $this->_search_params['minage'],
 				'timestamp_maximum_age' => empty($this->_search_params['maxage']) ? 0 : time() - 86400 * $this->_search_params['maxage'],
 				'is_approved_true' => 1,
-			)
+			]
 		);
 		[$this->_minMsgID, $this->_maxMsgID] = $request->fetch_row();
+		$this->_minMsgID = (int) $this->_minMsgID;
+		$this->_maxMsgID = (int) $this->_maxMsgID;
 		if ($this->_minMsgID < 0 || $this->_maxMsgID < 0)
 		{
 			$context['search_errors']['no_messages_in_time_frame'] = true;
@@ -353,7 +355,7 @@ public function setUser($params)
 	 */
 	public function buildUserQuery($maxMembersToSearch)
 	{
-		$userString = strtr(Util::htmlspecialchars($this->_search_params['userspec'], ENT_QUOTES), array('&quot;' => '"'));
+		$userString = strtr(Util::htmlspecialchars($this->_search_params['userspec'], ENT_QUOTES), ['&quot;' => '"']);
 		$userString = strtr($userString, ['%' => '\%', '_' => '\_', '*' => '%', '?' => '_']);
 
 		preg_match_all('~"([^"]+)"~', $userString, $matches);
@@ -367,9 +369,9 @@ public function buildUserQuery($maxMembersToSearch)
 		{
 			$realNameMatches[] = $this->_db->quote(
 				'{string:possible_user}',
-				array(
+				[
 					'possible_user' => $possible_user
-				)
+				]
 			);
 		}
 
@@ -379,9 +381,9 @@ public function buildUserQuery($maxMembersToSearch)
 				id_member
 			FROM {db_prefix}members
 			WHERE {raw:match_possible_users}',
-			array(
+			[
 				'match_possible_users' => 'real_name LIKE ' . implode(' OR real_name LIKE ', $realNameMatches),
-			)
+			]
 		);
 
 		// Simply do nothing if there're too many members matching the criteria.
@@ -394,10 +396,10 @@ public function buildUserQuery($maxMembersToSearch)
 		{
 			$this->_userQuery = $this->_db->quote(
 				'm.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})',
-				array(
+				[
 					'id_member_guest' => 0,
 					'match_possible_guest_names' => 'm.poster_name LIKE ' . implode(' OR m.poster_name LIKE ', $realNameMatches),
-				)
+				]
 			);
 		}
 		// We have some users!
@@ -410,11 +412,11 @@ public function buildUserQuery($maxMembersToSearch)
 
 			$this->_userQuery = $this->_db->quote(
 				'(m.id_member IN ({array_int:matched_members}) OR (m.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})))',
-				array(
+				[
 					'matched_members' => $this->_memberlist,
 					'id_member_guest' => 0,
 					'match_possible_guest_names' => 'm.poster_name LIKE ' . implode(' OR m.poster_name LIKE ', $realNameMatches),
-				)
+				]
 			);
 		}
 
@@ -471,10 +473,10 @@ public function setTopicBoardLimit($query_boards)
 					AND {query_see_board}' . ($modSettings['postmod_active'] ? '
 					AND t.approved = {int:is_approved_true}' : '') . '
 				LIMIT 1',
-				array(
+				[
 					'search_topic_id' => $this->_search_params['topic'],
 					'is_approved_true' => 1,
-				)
+				]
 			);
 			if ($request->num_rows() === 0)
 			{
@@ -496,12 +498,12 @@ public function setTopicBoardLimit($query_boards)
 		}
 
 		require_once(SUBSDIR . '/Boards.subs.php');
-		$brd = array_keys(fetchBoardsInfo(array(
-			'boards' => $query_boards), array(
+		$brd = array_keys(fetchBoardsInfo([
+			'boards' => $query_boards], [
 				'include_recycle' => false,
 				'include_redirects' => false,
 				'wanna_see_board' => empty($this->_search_params['advanced'])
-			)
+			]
 		));
 
 		// This error should pro'bly only happen for hackers.
@@ -534,7 +536,9 @@ public function setBoardQuery()
 				return $this->_boardQuery = '';
 			}
 
-			if (count($this->_search_params['brd']) === $num_boards - 1 && !empty($modSettings['recycle_board']) && !in_array($modSettings['recycle_board'], $this->_search_params['brd']))
+			if (count($this->_search_params['brd']) === $num_boards - 1
+				&& !empty($modSettings['recycle_board'])
+				&& !in_array((int) $modSettings['recycle_board'], $this->_search_params['brd'], true))
 			{
 				return $this->_boardQuery = '!= ' . $modSettings['recycle_board'];
 			}
@@ -556,14 +560,14 @@ public function setSortAndDirection($params)
 		$sort_columns = ['relevance', 'num_replies', 'id_msg',];
 
 		// Allow integration to add additional sort columns
-		call_integration_hook('integrate_search_sort_columns', array(&$sort_columns));
+		call_integration_hook('integrate_search_sort_columns', [&$sort_columns]);
 
 		if (empty($this->_search_params['sort']) && !empty($params['sort']))
 		{
 			[$this->_search_params['sort'], $this->_search_params['sort_dir']] = array_pad(explode('|', $params['sort']), 2, '');
 		}
 
-		$this->_search_params['sort'] = !empty($this->_search_params['sort']) && in_array($this->_search_params['sort'], $sort_columns) ? $this->_search_params['sort'] : 'relevance';
+		$this->_search_params['sort'] = !empty($this->_search_params['sort']) && in_array($this->_search_params['sort'], $sort_columns, true) ? $this->_search_params['sort'] : 'relevance';
 
 		if (!empty($this->_search_params['topic']) && $this->_search_params['sort'] === 'num_replies')
 		{
diff --git a/sources/ElkArte/Search/WeightFactors.php b/sources/ElkArte/Search/WeightFactors.php
index 16a50510bd..57ea74b17f 100644
--- a/sources/ElkArte/Search/WeightFactors.php
+++ b/sources/ElkArte/Search/WeightFactors.php
@@ -57,75 +57,75 @@ public function __construct(protected $_input_weights, $is_admin = false)
 	 */
 	private function _setup_weight_factors()
 	{
-		$default_factors = array(
-			'frequency' => array(
+		$default_factors = [
+			'frequency' => [
 				'search' => 'COUNT(*) / (CASE WHEN MAX(t.num_replies) < {int:short_topic_posts} THEN {int:short_topic_posts} ELSE MAX(t.num_replies) + 1 END)',
 				'results' => '(t.num_replies + 1)',
-			),
-			'age' => array(
+			],
+			'age' => [
 				'search' => 'CASE WHEN MAX(m.id_msg) < {int:min_msg} THEN 0 ELSE (MAX(m.id_msg) - {int:min_msg}) / {int:recent_message} END',
 				'results' => 'CASE WHEN t.id_first_msg < {int:min_msg} THEN 0 ELSE (t.id_first_msg - {int:min_msg}) / {int:recent_message} END',
-			),
-			'length' => array(
+			],
+			'length' => [
 				'search' => 'CASE WHEN MAX(t.num_replies) < {int:huge_topic_posts} THEN MAX(t.num_replies) / {int:huge_topic_posts} ELSE 1 END',
 				'results' => 'CASE WHEN t.num_replies < {int:huge_topic_posts} THEN t.num_replies / {int:huge_topic_posts} ELSE 1 END',
-			),
-			'subject' => array(
+			],
+			'subject' => [
 				'search' => 0,
 				'results' => 0,
-			),
-			'first_message' => array(
+			],
+			'first_message' => [
 				'search' => 'CASE WHEN MIN(m.id_msg) = MAX(t.id_first_msg) THEN 1 ELSE 0 END',
-			),
-			'sticky' => array(
+			],
+			'sticky' => [
 				'search' => 'MAX(t.is_sticky)',
 				'results' => 't.is_sticky',
-			),
-			'likes' => array(
+			],
+			'likes' => [
 				'search' => 'CASE WHEN t.num_likes > 20 THEN 1 ELSE t.num_likes / 20 END',
 				'results' => 't.num_likes',
-			),
-		);
-		$this->_weight_factors = array(
-			'frequency' => array(
+			],
+		];
+		$this->_weight_factors = [
+			'frequency' => [
 				'search' => 'COUNT(*) / (CASE WHEN MAX(t.num_replies) < {int:short_topic_posts} THEN {int:short_topic_posts} ELSE MAX(t.num_replies) + 1 END)',
 				'results' => '(t.num_replies + 1)',
-			),
-			'age' => array(
+			],
+			'age' => [
 				'search' => 'CASE WHEN MAX(m.id_msg) < {int:min_msg} THEN 0 ELSE (MAX(m.id_msg) - {int:min_msg}) / {int:recent_message} END',
 				'results' => 'CASE WHEN t.id_first_msg < {int:min_msg} THEN 0 ELSE (t.id_first_msg - {int:min_msg}) / {int:recent_message} END',
-			),
-			'length' => array(
+			],
+			'length' => [
 				'search' => 'CASE WHEN MAX(t.num_replies) < {int:huge_topic_posts} THEN MAX(t.num_replies) / {int:huge_topic_posts} ELSE 1 END',
 				'results' => 'CASE WHEN t.num_replies < {int:huge_topic_posts} THEN t.num_replies / {int:huge_topic_posts} ELSE 1 END',
-			),
-			'subject' => array(
+			],
+			'subject' => [
 				'search' => 0,
 				'results' => 0,
-			),
-			'first_message' => array(
+			],
+			'first_message' => [
 				'search' => 'CASE WHEN MIN(m.id_msg) = MAX(t.id_first_msg) THEN 1 ELSE 0 END',
-			),
-			'sticky' => array(
+			],
+			'sticky' => [
 				'search' => 'MAX(t.is_sticky)',
 				'results' => 't.is_sticky',
-			),
-			'likes' => array(
+			],
+			'likes' => [
 				'search' => 'CASE WHEN t.num_likes > 20 THEN 1 ELSE t.num_likes / 20 END',
 				'results' => 't.num_likes',
-			),
-		);
+			],
+		];
 		// These are fallback weights in case of errors somewhere.
 		// Not intended to be passed to the hook
-		$default_weights = array(
+		$default_weights = [
 			'search_weight_frequency' => 30,
 			'search_weight_age' => 25,
 			'search_weight_length' => 20,
 			'search_weight_subject' => 15,
 			'search_weight_first_message' => 10,
-		);
+		];
 
-		call_integration_hook('integrate_search_weights', array(&$this->_weight_factors));
+		call_integration_hook('integrate_search_weights', [&$this->_weight_factors]);
 
 		// Set the weight factors for each area (frequency, age, etc) as defined in the ACP
 		$this->_calculate_weights($this->_weight_factors, $this->_input_weights);

From 8d4cbef884d700f0dabc5708f711f1ff6bfffe44 Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Tue, 2 Apr 2024 16:09:31 -0500
Subject: [PATCH 10/13] ! over sized radius

---
 themes/default/css/index.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/default/css/index.css b/themes/default/css/index.css
index ab1023c972..f900a9b3bc 100644
--- a/themes/default/css/index.css
+++ b/themes/default/css/index.css
@@ -5540,7 +5540,7 @@ div.labels {
 	margin: 5px auto;
 	padding: 3px;
 	border: 1px solid;
-	border-radius: 16px;
+	border-radius: 8px;
 }
 
 .progress_compact {
@@ -5553,7 +5553,7 @@ div.labels {
 	line-height: 2;
 	height: 2em;
 	text-align: center;
-	border-radius: 12px;
+	border-radius: 6px;
 }
 
 .progress_compact > .green_percent, .progress_compact > .blue_percent {

From f414205dfb51f6fa17b3cc4f1d498da8f017b5e4 Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Tue, 2 Apr 2024 16:10:19 -0500
Subject: [PATCH 11/13] ! would you believe?  Still not sure where thought
 (happened in search)

---
 sources/ElkArte/Languages/Loader.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sources/ElkArte/Languages/Loader.php b/sources/ElkArte/Languages/Loader.php
index ae53e1390f..e69ac5cb84 100644
--- a/sources/ElkArte/Languages/Loader.php
+++ b/sources/ElkArte/Languages/Loader.php
@@ -180,6 +180,11 @@ private function logError($file, $found_fallback)
 	{
 		global $txt;
 
+		if ($file === '')
+		{
+			return;
+		}
+
 		if ($file !== 'Addons')
 		{
 			Errors::instance()->log_error(

From 2105a394bb71f789a395771e7f7c557fb9a43931 Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Tue, 2 Apr 2024 16:35:54 -0500
Subject: [PATCH 12/13] ! address Remove presentation spaces from JS #3456

---
 themes/default/css/index.css              | 5 +++++
 themes/default/scripts/PersonalMessage.js | 4 ++--
 themes/default/scripts/like_posts.js      | 4 ++--
 themes/default/scripts/post.js            | 2 +-
 themes/default/scripts/script.js          | 2 +-
 themes/default/scripts/suggest.js         | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/themes/default/css/index.css b/themes/default/css/index.css
index f900a9b3bc..c919e2c678 100644
--- a/themes/default/css/index.css
+++ b/themes/default/css/index.css
@@ -226,6 +226,11 @@ h2 + fieldset {
 	margin: 4px 0;
 }
 
+/* Used in JS in place of inlined &nbsp; */
+.breaking_space::before {
+	content: "\00a0";
+}
+
 /* Set list-style to none by default. Best in most places.*/
 ul, ol {
 	list-style: none;
diff --git a/themes/default/scripts/PersonalMessage.js b/themes/default/scripts/PersonalMessage.js
index f8e0c33191..7af668239e 100644
--- a/themes/default/scripts/PersonalMessage.js
+++ b/themes/default/scripts/PersonalMessage.js
@@ -530,7 +530,7 @@ function addCriteriaOption ()
 	setOuterHTML(document.getElementById('criteriaAddHere'), '<br />' +
 		'<select class="criteria" name="ruletype[' + criteriaNum + ']" id="ruletype' + criteriaNum + '" data-optnum="' + criteriaNum + '">' +
 		'   <option value="">' + txt_pm_rule_criteria_pick + ':</option>' + rules_option + '' +
-		'</select>&nbsp;' +
+		'</select><span class="breaking_space">' +
 		'<span id="defdiv' + criteriaNum + '" class="hide">' +
 		'<input type="text" name="ruledef[' + criteriaNum + ']" id="ruledef' + criteriaNum + '" value="" />' +
 		'</span>' +
@@ -579,7 +579,7 @@ function addActionOption ()
 		'   <option value="">' + txt_pm_rule_sel_action + ':</option>' +
 		'   <option value="lab">' + txt_pm_rule_label + '</option>' +
 		'   <option value="del">' + txt_pm_rule_delete + '</option>' +
-		'</select>&nbsp;' +
+		'</select><span class="breaking_space">' +
 		'<span id="labdiv' + actionNum + '" class="hide">' +
 		'<select name="labdef[' + actionNum + ']" id="labdef' + actionNum + '">' +
 		'   <option value="">' + txt_pm_rule_sel_label + '</option>' + label_option +
diff --git a/themes/default/scripts/like_posts.js b/themes/default/scripts/like_posts.js
index 8e6b247107..ed02f126e5 100644
--- a/themes/default/scripts/like_posts.js
+++ b/themes/default/scripts/like_posts.js
@@ -140,12 +140,12 @@
 				// Update the count bubble and like list line if it exists
 				if (params.count !== 0)
 				{
-					params.event.innerHTML = '<span class="button_indicator">' + params.count + '</span>&nbsp;' + params.text;
+					params.event.innerHTML = '<span class="button_indicator">' + params.count + '</span><span class="breaking_space">' + params.text;
 
 					if (likesList)
 					{
 						likesList.classList.remove('hide');
-						likesList.innerHTML = '<i class="icon icon-small i-thumbup"></i>&nbsp;' + params.title;
+						likesList.innerHTML = '<i class="icon icon-small i-thumbup"></i><span class="breaking_space">' + params.title;
 					}
 				}
 				else
diff --git a/themes/default/scripts/post.js b/themes/default/scripts/post.js
index 0f14aa7c5a..82b3d296f3 100644
--- a/themes/default/scripts/post.js
+++ b/themes/default/scripts/post.js
@@ -327,7 +327,7 @@ function onDocSent (XMLDoc)
 				}
 
 				newPostsHTML += '<div class="content forumposts"><div class="postarea2" id="msg' + newPosts[i].getAttribute('id') + '"><div class="keyinfo">';
-				newPostsHTML += '<h3 class="floatleft"><span>' + txt_posted_by + '</span>&nbsp;' + newPosts[i].getElementsByTagName('poster')[0].firstChild.nodeValue + '&nbsp;-&nbsp;' + newPosts[i].getElementsByTagName('time')[0].firstChild.nodeValue;
+				newPostsHTML += '<h3 class="floatleft"><span>' + txt_posted_by + '</span><span class="breaking_space">' + newPosts[i].getElementsByTagName('poster')[0].firstChild.nodeValue + '<span class="breaking_space">-<span class="breaking_space">' + newPosts[i].getElementsByTagName('time')[0].firstChild.nodeValue;
 				newPostsHTML += ' <span class="new_posts" id="image_new_' + newPosts[i].getAttribute('id') + '">' + txt_new + '</span></h3>';
 
 				if (can_quote)
diff --git a/themes/default/scripts/script.js b/themes/default/scripts/script.js
index 83f0df5325..30e40c2949 100644
--- a/themes/default/scripts/script.js
+++ b/themes/default/scripts/script.js
@@ -1118,7 +1118,7 @@ JumpTo.prototype.showSelect = function() {
 		sChildLevelPrefix += this.opt.sBoardPrefix;
 	}
 
-	document.getElementById(this.opt.sContainerId).innerHTML = this.opt.sJumpToTemplate.replace(/%select_id%/, this.opt.sContainerId + '_select').replace(/%dropdown_list%/, '<select ' + (this.opt.bDisabled === true ? 'disabled="disabled" ' : '') + (this.opt.sClassName !== undefined ? 'class="' + this.opt.sClassName + '" ' : '') + 'name="' + (this.opt.sCustomName !== undefined ? this.opt.sCustomName : this.opt.sContainerId + '_select') + '" id="' + this.opt.sContainerId + '_select"><option value="' + (this.opt.bNoRedirect !== undefined && this.opt.bNoRedirect === true ? this.opt.iCurBoardId : '?board=' + this.opt.iCurBoardId + '.0') + '">' + sChildLevelPrefix + this.opt.sCurBoardName.removeEntities() + '</option></select>&nbsp;' + (this.opt.sGoButtonLabel !== undefined ? '<input type="button" class="button_submit" value="' + this.opt.sGoButtonLabel + '" onclick="window.location.href = \'' + elk_prepareScriptUrl(elk_scripturl) + 'board=' + this.opt.iCurBoardId + '.0\';" />' : ''));
+	document.getElementById(this.opt.sContainerId).innerHTML = this.opt.sJumpToTemplate.replace(/%select_id%/, this.opt.sContainerId + '_select').replace(/%dropdown_list%/, '<select ' + (this.opt.bDisabled === true ? 'disabled="disabled" ' : '') + (this.opt.sClassName !== undefined ? 'class="' + this.opt.sClassName + '" ' : '') + 'name="' + (this.opt.sCustomName !== undefined ? this.opt.sCustomName : this.opt.sContainerId + '_select') + '" id="' + this.opt.sContainerId + '_select"><option value="' + (this.opt.bNoRedirect !== undefined && this.opt.bNoRedirect === true ? this.opt.iCurBoardId : '?board=' + this.opt.iCurBoardId + '.0') + '">' + sChildLevelPrefix + this.opt.sCurBoardName.removeEntities() + '</option></select><span class="breaking_space">' + (this.opt.sGoButtonLabel !== undefined ? '<input type="button" class="button_submit" value="' + this.opt.sGoButtonLabel + '" onclick="window.location.href = \'' + elk_prepareScriptUrl(elk_scripturl) + 'board=' + this.opt.iCurBoardId + '.0\';" />' : ''));
 	this.dropdownList = document.getElementById(this.opt.sContainerId + '_select');
 };
 
diff --git a/themes/default/scripts/suggest.js b/themes/default/scripts/suggest.js
index c5848237da..8b3c4475c9 100644
--- a/themes/default/scripts/suggest.js
+++ b/themes/default/scripts/suggest.js
@@ -48,7 +48,7 @@ function elk_AutoSuggest (oOptions)
 	// Are there any items that should be added in advance?
 	this.aListItems = this.opt.aListItems || [];
 
-	this.sItemTemplate = this.opt.sItemTemplate || '<input type="hidden" name="%post_name%[]" value="%item_id%" /><a href="%item_href%" class="extern" onclick="window.open(this.href, \'_blank\'); return false;">%item_name%</a>&nbsp;<i class="icon icon-small i-remove" title="%delete_text%"><s>%delete_text%</s></i>';
+	this.sItemTemplate = this.opt.sItemTemplate || '<input type="hidden" name="%post_name%[]" value="%item_id%" /><a href="%item_href%" class="extern" onclick="window.open(this.href, \'_blank\'); return false;">%item_name%</a><span class="breaking_space"></span><i class="icon icon-small i-remove" title="%delete_text%"><s>%delete_text%</s></i>';
 	this.sTextDeleteItem = this.opt.sTextDeleteItem || '';
 	this.oCallback = {};
 	this.bDoAutoAdd = false;

From 82c43aa03c1f91a7f9f62d70e2ff2299a19ad70b Mon Sep 17 00:00:00 2001
From: Spuds <spuds@spudsdesign.com>
Date: Wed, 3 Apr 2024 09:02:17 -0500
Subject: [PATCH 13/13] ! Address ip instead url site #3245

---
 sources/ElkArte/Server.php             | 10 ++++++++++
 sources/ElkArte/Themes/ThemeLoader.php |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/sources/ElkArte/Server.php b/sources/ElkArte/Server.php
index daf3496513..39f22b8978 100644
--- a/sources/ElkArte/Server.php
+++ b/sources/ElkArte/Server.php
@@ -204,6 +204,16 @@ public function supportsSSL()
 			|| (isset($this->HTTP_X_FORWARDED_PROTO) && $this->HTTP_X_FORWARDED_PROTO === 'https');
 	}
 
+	/**
+	 * Get the host of the current request
+	 *
+	 * This method retrieves the host of the current request. It first attempts to get the host
+	 * from the `HTTP_HOST` property of the object. If the `HTTP_HOST` property is empty,
+	 * it falls back to using the `SERVER_NAME` property. If a port other than 80 or 443 is specified
+	 * in the `SERVER_PORT` property, it appends the port number to the host.
+	 *
+	 * @return string The host of the current request
+	 */
 	public function getHost()
 	{
 		$host = $this->HTTP_HOST;
diff --git a/sources/ElkArte/Themes/ThemeLoader.php b/sources/ElkArte/Themes/ThemeLoader.php
index e8435d726c..bdd6ec821d 100644
--- a/sources/ElkArte/Themes/ThemeLoader.php
+++ b/sources/ElkArte/Themes/ThemeLoader.php
@@ -359,6 +359,9 @@ static function ($row) use ($immutable_theme_data, &$themeData) {
 	 * Detects url and checks against expected boardurl
 	 *
 	 * Attempts to correct improper URL's
+	 *  - Point to httpS if http is requested
+	 *  - Point to www.siteName.com if siteName.com is requested
+	 *  - Point to an proper address if this is an alias address
 	 */
 	private function loadThemeUrls()
 	{
@@ -392,7 +395,10 @@ private function loadThemeUrls()
 			}
 
 			// Okay, #4 - perhaps it's an IP address?  We're gonna want to use that one, then. (assuming it's the IP or something...)
-			if ($do_fix === true || preg_match('~^http[s]?://(?:[\d\.:]+|\[[\d:]+\](?::\d+)?)(?:$|/)~', $detected_url) === 1)
+			// Okay, #4a - The previous code had || preg_match('~^http[s]?://(?:[\d\.:]+|\[[\d:]+\](?::\d+)?)(?:$|/)~', $detected_url) === 1)
+			// however this has shown to replace valid site name with a ip address, leaving the site wrecked due to $_SERVER
+			// returning suspect info
+			if ($do_fix === true)
 			{
 				$this->fixThemeUrls($detected_url);
 			}