Merge pull request #9260 from Sesquipedalian/3.0/user_fixes

Sesquipedalian · web-flow · commit 43da625acbef · 2026-06-10T15:18:49.000-06:00
[3.0] Misc fixes for SMF\User
diff --git a/Sources/Actions/AutoSuggest.php b/Sources/Actions/AutoSuggest.php
@@ -18,6 +18,7 @@
 use SMF\ActionInterface;
 use SMF\ActionRouter;
 use SMF\ActionTrait;
+use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\OutputTypeInterface;
@@ -136,6 +137,11 @@ public function member(): array
 			],
 		];
 
+		// Can't search for buddies if that feature is disabled.
+		if (empty(Config::$modSettings['enable_buddylist'])) {
+			unset($this->search_param['buddies']);
+		}
+
 		// Find the member.
 		$request = Db::$db->query(
 			'SELECT id_member, real_name
diff --git a/Sources/Actions/BoardIndex.php b/Sources/Actions/BoardIndex.php
@@ -80,7 +80,7 @@ public function execute(): void
 
 		// Set a few minor things.
 		Utils::$context['show_stats'] = User::$me->allowedTo('view_stats') && !empty(Config::$modSettings['trackStats']);
-		Utils::$context['show_buddies'] = !empty(User::$me->buddies);
+		Utils::$context['show_buddies'] = !empty(User::$me->buddies) && !empty(Config::$modSettings['enable_buddylist']);
 		Utils::$context['show_who'] = User::$me->allowedTo('who_view') && !empty(Config::$modSettings['who_enabled']);
 
 		// Retrieve the categories and boards.
@@ -436,7 +436,7 @@ public static function get(array $board_index_options): array
 			$parent = Board::$loaded[$row_board['id_parent']] ?? null;
 
 			// Perhaps we are ignoring this board?
-			$ignoreThisBoard = \in_array($row_board['id_board'], User::$me->ignoreboards);
+			$ignoreThisBoard = !empty(Config::$modSettings['allow_ignore_boards']) && \in_array($row_board['id_board'], User::$me->ignoreboards);
 			$row_board['is_read'] = !empty($row_board['is_read']) || $ignoreThisBoard ? '1' : '0';
 
 			if ($board_index_options['include_categories']) {
diff --git a/Sources/Actions/BuddyListToggle.php b/Sources/Actions/BuddyListToggle.php
@@ -19,6 +19,7 @@
 use SMF\ActionRouter;
 use SMF\ActionTrait;
 use SMF\Cache\CacheApi;
+use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Routable;
@@ -61,7 +62,7 @@ public function execute(): void
 		User::$me->isAllowedTo('profile_extra_own');
 		User::$me->kickIfGuest();
 
-		if (empty($this->userReceiver)) {
+		if (empty($this->userReceiver) || empty(Config::$modSettings['enable_buddylist'])) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 
diff --git a/Sources/Actions/Calendar.php b/Sources/Actions/Calendar.php
@@ -1511,7 +1511,10 @@ public static function cacheAdjustData(array &$cache_block, array &$params): voi
 		foreach ($cache_block['data']['calendar_events'] as $k => $event) {
 			// Remove events that the user may not see or wants to ignore.
 			if (
-				\in_array($event->id_board, User::$me->ignoreboards)
+				(
+					!empty(Config::$modSettings['allow_ignore_boards'])
+					&& \in_array($event->id_board, User::$me->ignoreboards)
+				)
 				|| (
 					\count(array_intersect(User::$me->groups, $event->allowed_groups)) === 0
 					&& !User::$me->allowedTo('admin_forum')
diff --git a/Sources/Actions/Display.php b/Sources/Actions/Display.php
@@ -861,7 +861,7 @@ protected function getWhoViewing(): void
 					$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
 				}
 
-				$is_buddy = \in_array($row['id_member'], User::$me->buddies);
+				$is_buddy = !empty(Config::$modSettings['enable_buddylist']) && \in_array($row['id_member'], User::$me->buddies);
 
 				if ($is_buddy) {
 					$link = '<strong>' . $link . '</strong>';
diff --git a/Sources/Actions/MessageIndex.php b/Sources/Actions/MessageIndex.php
@@ -870,7 +870,7 @@ protected function getWhoViewing(): void
 					$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
 				}
 
-				$is_buddy = \in_array($row['id_member'], User::$me->buddies);
+				$is_buddy = !empty(Config::$modSettings['enable_buddylist']) && \in_array($row['id_member'], User::$me->buddies);
 
 				if ($is_buddy) {
 					$link = '<strong>' . $link . '</strong>';
diff --git a/Sources/Actions/RequestMembers.php b/Sources/Actions/RequestMembers.php
@@ -18,6 +18,7 @@
 use SMF\ActionInterface;
 use SMF\ActionRouter;
 use SMF\ActionTrait;
+use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
 use SMF\Routable;
 use SMF\User;
@@ -65,6 +66,11 @@ public function execute(): void
 
 		header('content-type: text/plain; charset=UTF-8');
 
+		// Can't search for buddies if that feature is disabled.
+		if (empty(Config::$modSettings['enable_buddylist'])) {
+			unset($_REQUEST['buddies']);
+		}
+
 		$request = Db::$db->query(
 			'SELECT real_name
 			FROM {db_prefix}members
diff --git a/Sources/Actions/Search.php b/Sources/Actions/Search.php
@@ -209,7 +209,7 @@ public function execute(): void
 				}
 				// User didn't select any boards, so select all except ignored and recycle boards.
 				else {
-					$board->selected = !$board->recycle && !\in_array($board->id, User::$me->ignoreboards);
+					$board->selected = !$board->recycle && (empty(Config::$modSettings['allow_ignore_boards']) || !\in_array($board->id, User::$me->ignoreboards));
 				}
 
 				if (!$board->selected && !$board->recycle) {
diff --git a/Sources/Logging.php b/Sources/Logging.php
@@ -669,7 +669,7 @@ public static function getMembersOnlineStats(array $membersOnlineOptions): array
 			}
 
 			// Buddies get counted and highlighted.
-			$is_buddy = \in_array($row['id_member'], User::$me->buddies);
+			$is_buddy = !empty(Config::$modSettings['enable_buddylist']) && \in_array($row['id_member'], User::$me->buddies);
 
 			if ($is_buddy) {
 				$membersOnlineStats['num_buddies']++;
diff --git a/Sources/Parser.php b/Sources/Parser.php
@@ -230,11 +230,11 @@ abstract class Parser
 	public static string $locale;
 
 	/**
-	 * @var int
+	 * @var float
 	 *
 	 * User's time offset from UTC.
 	 */
-	public static int $time_offset;
+	public static float $time_offset;
 
 	/**
 	 * @var string
diff --git a/Sources/ServerSideIncludes.php b/Sources/ServerSideIncludes.php
@@ -1694,7 +1694,7 @@ public static function whosOnline(string $output_method = 'echo'): ?array
 
 		$bracketList = [];
 
-		if (!empty(User::$me->buddies)) {
+		if (!empty(Config::$modSettings['enable_buddylist']) && !empty(User::$me->buddies)) {
 			$bracketList[] = Lang::getTxt('number_of_buddies', [$return['num_buddies']], file: 'General');
 		}
 
diff --git a/Sources/Subs-Compat.php b/Sources/Subs-Compat.php
@@ -10682,11 +10682,13 @@ function is_not_banned(bool $force_check = false): void
 	 */
 	function banPermissions(): void
 	{
-		if (!isset(SMF\User::$me->permission_set)) {
+		if (!isset(SMF\User::$me->permission_sets)) {
 			SMF\User::$me->loadPermissions();
 		}
 
-		SMF\User::$me->permission_set->applyBansAndWarnings();
+		foreach (SMF\User::$me->permission_sets as $set) {
+			$set->applyBansAndWarnings();
+		}
 	}
 
 	/**
diff --git a/Sources/Tasks/AnonymizeEditHistory.php b/Sources/Tasks/AnonymizeEditHistory.php
@@ -56,7 +56,6 @@ public function execute(): bool
 
 		if (Db::$title === POSTGRE_TITLE) {
 			$request = Db::$db->query(
-				'',
 				'SELECT id_msg, edit_history
 				FROM {db_prefix}messages
 				WHERE edit_history @? {string:jsonpath}
@@ -69,7 +68,6 @@ public function execute(): bool
 			);
 		} else {
 			$request = Db::$db->query(
-				'',
 				'SELECT id_msg, edit_history
 				FROM {db_prefix}messages
 				WHERE {int:member} MEMBER OF (edit_history->{string:path})
@@ -98,7 +96,6 @@ public function execute(): bool
 			$row['edit_history'] = json_encode($row['edit_history']);
 
 			Db::$db->query(
-				'',
 				'UPDATE {db_prefix}messages
 				SET edit_history = {string:edit_history}
 				WHERE id_msg = {int:id_msg}',
diff --git a/Sources/User.php b/Sources/User.php
@@ -347,11 +347,11 @@ class User implements \ArrayAccess
 	public string $timezone;
 
 	/**
-	 * @var int
+	 * @var float
 	 *
 	 * The UTC offset of the user's time zone.
 	 */
-	public int $time_offset;
+	public float $time_offset;
 
 	/**
 	 * @var int
@@ -1026,6 +1026,7 @@ public function format(bool $display_custom_fields = false): array
 				foreach (['actual_theme_dir' => 'images_url', 'default_theme_dir' => 'default_images_url'] as $dir => $url) {
 					if (file_exists(Theme::$current->settings[$dir] . '/images/membericons/' . $this->icons[1])) {
 						$group_icon_url = Theme::$current->settings[$url] . '/membericons/' . $this->icons[1];
+						break;
 					}
 				}
 			}
@@ -1038,8 +1039,8 @@ public function format(bool $display_custom_fields = false): array
 				'username_color' => '<span ' . (!empty($this->group_color) ? 'style="color:' . $this->group_color . ';"' : '') . '>' . $this->username . '</span>',
 				'name_color' => '<span ' . (!empty($this->group_color) ? 'style="color:' . $this->group_color . ';"' : '') . '>' . $this->name . '</span>',
 				'link_color' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->id . '" title="' . Lang::getTxt('view_profile_of_username', ['name' => $this->name], file: 'General') . '" ' . (!empty($this->group_color) ? 'style="color:' . $this->group_color . ';"' : '') . '>' . $this->name . '</a>',
-				'is_buddy' => \in_array($this->id, self::$me->buddies),
-				'is_reverse_buddy' => \in_array(self::$me->id, $this->buddies),
+				'is_buddy' => !empty(Config::$modSettings['enable_buddylist']) && \in_array($this->id, self::$me->buddies),
+				'is_reverse_buddy' => !empty(Config::$modSettings['enable_buddylist']) && \in_array(self::$me->id, $this->buddies),
 				'buddies' => $this->buddies,
 				'title' => !empty(Config::$modSettings['titlesEnable']) ? $this->title : '',
 				'blurb' => $this->personal_text,
@@ -1861,8 +1862,8 @@ public function kickIfBanned(bool $force_check = false): void
 		}
 
 		// Fix up the banning permissions.
-		if (isset($this->permissions_set)) {
-			$this->permissions_set->applyBansAndWarnings();
+		foreach ($this->permission_sets as $set) {
+			$set->applyBansAndWarnings();
 		}
 	}
 
@@ -2723,7 +2724,7 @@ public static function buildQueryBoard(int $id): array
 		// This will take the place of query_see_boards in certain spots, so it better include the boards they can see also
 
 		// If they aren't ignoring any boards then they want to see all the boards they can see
-		if (empty($ignoreboards)) {
+		if (empty(Config::$modSettings['allow_ignore_boards']) || empty($this->ignoreboards)) {
 			$query_part['query_wanna_see_board'] = $query_part['query_see_board'];
 			$query_part['query_wanna_see_message_board'] = $query_part['query_see_message_board'];
 			$query_part['query_wanna_see_topic_board'] = $query_part['query_see_topic_board'];
@@ -2882,7 +2883,7 @@ public static function updateMemberData(int|array|null $members, array $data): v
 					$val = max(0, $val);
 				}
 
-				User::$loaded[$member]->set([$var, $val]);
+				User::$loaded[$member]->set([$var => $val]);
 			}
 		}
 
@@ -3461,7 +3462,7 @@ public static function isReservedName(string $name, int $current_id_member = 0,
 		}
 
 		// Check for similar existing member names.
-		if (Unicode\SpoofDetector::checkSimilarMemberName($name, $id_member ?? 0, $fatal)) {
+		if (Unicode\SpoofDetector::checkSimilarMemberName($name, $current_id_member ?? 0, $fatal)) {
 			return true;
 		}
 
@@ -3619,7 +3620,7 @@ public static function find(string|array $names, bool $use_wildcards = false, bo
 				AND is_activated IN ({array_int:activated})
 			LIMIT {int:limit}',
 			array_merge($where_params, [
-				'buddy_list' => self::$me->buddies,
+				'buddy_list' => !empty(Config::$modSettings['enable_buddylist']) ? self::$me->buddies : [],
 				'limit' => $max,
 				'activated' => [self::ACTIVATED, self::ACTIVATED_BANNED],
 			]),
@@ -3945,7 +3946,7 @@ protected function setProperties(): void
 		$this->time_offset = (int) ($profile['time_offset'] ?? 0);
 
 		// Buddies and personal messages.
-		$this->buddies = !empty(Config::$modSettings['enable_buddylist']) && !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : [];
+		$this->buddies = !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : [];
 		$this->ignoreusers = !empty($profile['pm_ignore_list']) ? explode(',', $profile['pm_ignore_list']) : [];
 		$this->pm_receive_from = (int) ($profile['pm_receive_from'] ?? 0);
 		$this->pm_prefs = (int) ($profile['pm_prefs'] ?? 0);

Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ protected function getWhoViewing(): void`
`861`	`861`	`$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';`
`862`	`862`	`}`
`863`	`863`
`864`		`- $is_buddy = \in_array($row['id_member'], User::$me->buddies);`
	`864`	`+ $is_buddy = !empty(Config::$modSettings['enable_buddylist']) && \in_array($row['id_member'], User::$me->buddies);`
`865`	`865`
`866`	`866`	`if ($is_buddy) {`
`867`	`867`	`$link = '<strong>' . $link . '</strong>';`
Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,7 @@ protected function getWhoViewing(): void`
`870`	`870`	`$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';`
`871`	`871`	`}`
`872`	`872`
`873`		`- $is_buddy = \in_array($row['id_member'], User::$me->buddies);`
	`873`	`+ $is_buddy = !empty(Config::$modSettings['enable_buddylist']) && \in_array($row['id_member'], User::$me->buddies);`
`874`	`874`
`875`	`875`	`if ($is_buddy) {`
`876`	`876`	`$link = '<strong>' . $link . '</strong>';`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public function execute(): void`
`209`	`209`	`}`
`210`	`210`	`// User didn't select any boards, so select all except ignored and recycle boards.`
`211`	`211`	`else {`
`212`		`- $board->selected = !$board->recycle && !\in_array($board->id, User::$me->ignoreboards);`
	`212`	`+ $board->selected = !$board->recycle && (empty(Config::$modSettings['allow_ignore_boards']) \|\| !\in_array($board->id, User::$me->ignoreboards));`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`if (!$board->selected && !$board->recycle) {`
Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,7 @@ public static function getMembersOnlineStats(array $membersOnlineOptions): array`
`669`	`669`	`}`
`670`	`670`
`671`	`671`	`// Buddies get counted and highlighted.`
`672`		`- $is_buddy = \in_array($row['id_member'], User::$me->buddies);`
	`672`	`+ $is_buddy = !empty(Config::$modSettings['enable_buddylist']) && \in_array($row['id_member'], User::$me->buddies);`
`673`	`673`
`674`	`674`	`if ($is_buddy) {`
`675`	`675`	`$membersOnlineStats['num_buddies']++;`