Merge pull request SimpleMachines#8407 from Sesquipedalian/3.0/misc_fixes

Author: Sesquipedalian

Sources/Actions/Recent.php

@@ -344,7 +344,8 @@ protected function getBoards(): void
 					'current_board' => Board::$info->id,
 				],
 			);
-			list($this->total_posts, $redirect) = Db::$db->fetch_row($request);
+			list($total_posts, $redirect) = Db::$db->fetch_row($request);
+			$this->total_posts = (int) $total_posts;
 			Db::$db->free_result($request);
 
 			// If this is a redirection board, don't bother counting topics here...

Sources/Actions/TopicMerge.php

@@ -972,8 +972,7 @@ public function merge(): void
 		$searchAPI = SearchApi::load();
 
 		if (is_callable([$searchAPI, 'topicMerge'])) {
-			// todo: undefined method
-			$searchAPI->topicMerge($id_topic, $this->topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : [Utils::$context['response_prefix'], $target_subject]);
+			$searchAPI->topicMerge($id_topic, $this->topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : Utils::$context['response_prefix'] . $target_subject);
 		}
 
 		// Merging is the sort of thing an external CMS might want to know about

Sources/Actions/TopicRestore.php

@@ -238,7 +238,7 @@ public function execute(): void
 					);
 
 					while ($member = Db::$db->fetch_assoc($request2)) {
-						User::updateMemberData($member['id_member'], ['posts' => 'posts + ' . $member['post_count']]);
+						User::updateMemberData((int) $member['id_member'], ['posts' => 'posts + ' . $member['post_count']]);
 					}
 					Db::$db->free_result($request2);
 				}

Sources/Actions/Unread.php

@@ -647,7 +647,8 @@ protected function getEarliestMsg(): void
 					'current_member' => User::$me->id,
 				],
 			);
-			list($this->earliest_msg) = Db::$db->fetch_row($request);
+			list($earliest_msg) = Db::$db->fetch_row($request);
+			$this->earliest_msg = (int) $earliest_msg;
 			Db::$db->free_result($request);
 		} else {
 			$request = Db::$db->query(
@@ -660,7 +661,8 @@ protected function getEarliestMsg(): void
 					'current_member' => User::$me->id,
 				],
 			);
-			list($this->earliest_msg) = Db::$db->fetch_row($request);
+			list($earliest_msg) = Db::$db->fetch_row($request);
+			$this->earliest_msg = (int) $earliest_msg;
 			Db::$db->free_result($request);
 		}
 
@@ -670,7 +672,7 @@ protected function getEarliestMsg(): void
 		} else {
 			// Using caching, when possible, to ignore the below slow query.
 			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time()) {
-				$earliest_msg2 = $_SESSION['cached_log_time'][1];
+				$earliest_msg2 = (int) $_SESSION['cached_log_time'][1];
 			} else {
 				// This query is pretty slow, but it's needed to ensure nothing crucial is ignored.
 				$request = Db::$db->query(
@@ -683,6 +685,7 @@ protected function getEarliestMsg(): void
 					],
 				);
 				list($earliest_msg2) = Db::$db->fetch_row($request);
+				$earliest_msg2 = (int) $earliest_msg2;
 				Db::$db->free_result($request);
 
 				// In theory this could be zero, if the first ever post is unread, so fudge it ;)

Sources/Autolinker.php

@@ -986,15 +986,15 @@ protected function setUrlRegex(): void
 		foreach (['path', 'query', 'fragment'] as $part) {
 			switch ($part) {
 				case 'path':
-					$part_excluded_trailing_chars = '[^\P{Po}?/#&]';
+					$part_excluded_trailing_chars = '[^\P{Po}?/#&"]';
 					break;
 
 				case 'query':
-					$part_excluded_trailing_chars = '[^\P{Po}#&]';
+					$part_excluded_trailing_chars = '[^\P{Po}#&"]';
 					break;
 
 				default:
-					$part_excluded_trailing_chars = '[^\P{Po}&]';
+					$part_excluded_trailing_chars = '[^\P{Po}&"]';
 					break;
 			}
 

Sources/Board.php

@@ -2415,7 +2415,7 @@ protected function loadBoardInfo(): void
 
 			if (!empty($temp)) {
 				foreach ($temp as $key => $value) {
-					if ($key === 'cat') {
+					if ($key === 'cat' && !($value instanceof Category)) {
 						$this->{$key} = Category::init($value['id'], $value);
 					} else {
 						$this->{$key} = $value;

Sources/PersonalMessage/PM.php

@@ -1953,7 +1953,7 @@ public static function getLatest(): int
 	{
 		$latest = self::getRecent('pm.id_pm', true, 1);
 
-		return reset($latest);
+		return (int) reset($latest);
 	}
 
 	/**

Sources/QueryString.php

@@ -440,7 +440,7 @@ public static function ob_sessrewrite(string $buffer): string
 				|| @get_cfg_var('cgi.fix_pathinfo') == 1
 			)
 			&& (
-				Sapi::isOS([Sapi::SERVER_APACHE, Sapi::SERVER_LIGHTTPD, Sapi::SERVER_LITESPEED])
+				Sapi::isSoftware([Sapi::SERVER_APACHE, Sapi::SERVER_LIGHTTPD, Sapi::SERVER_LITESPEED])
 			)
 		) {
 			// Let's do something special for session ids!

Sources/Sapi.php

@@ -72,14 +72,11 @@ class Sapi
 	 */
 	public static function isSoftware(string|array $server): bool
 	{
-		$servers = (array) $server;
-
-		foreach ($servers as $server) {
-			if (
-				isset($_SERVER['SERVER_SOFTWARE'])
-				&& strpos($_SERVER['SERVER_SOFTWARE'], self::$server_software[$server] ?? $server) !== false
-			) {
-				return true;
+		if (isset($_SERVER['SERVER_SOFTWARE'])) {
+			foreach ((array) $server as $serv) {
+				if (preg_match('~' . (self::$server_software[$serv] ?? $serv) . '~i', $_SERVER['SERVER_SOFTWARE'])) {
+					return true;
+				}
 			}
 		}
 

Themes/default/Recent.template.php

@@ -45,7 +45,7 @@ function template_recent()
 			<div class="page_number floatright"> #', $post['counter'], '</div>
 			<div class="topic_details">
 				<h5>', $post['board']['link'], ' / ', $post['link'], '</h5>
-				<span class="smalltext">', Lang::getTxt('last_post_member_date',  ['member' => $post['poster']['link'], '' => str_contains($post['time'], Lang::$txt['today']) ? 'today' : (str_contains($post['time'], Lang::$txt['yesterday']) ? 'yesterday' : 'other'), 'date' => $post['time']]), '</span>
+				<span class="smalltext">', Lang::getTxt('last_post_member_date',  ['member' => $post['poster']['link'], 'relative' => str_contains($post['time'], Lang::$txt['today']) ? 'today' : (str_contains($post['time'], Lang::$txt['yesterday']) ? 'yesterday' : 'other'), 'date' => $post['time']]), '</span>
 			</div>
 			<div class="list_posts">', $post['body'], '</div>';