From c8b97952e897ce67591e604e204dd2f2a38384fb Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 26 Apr 2024 17:24:25 +0200
Subject: [PATCH] Remove guests from the user online record permanently

Closes #5888
---
 com.woltlab.wcf/option.xml                                 | 7 +------
 constants.php                                              | 1 -
 .../files/lib/data/user/online/UsersOnlineList.class.php   | 2 +-
 wcfsetup/install/files/lib/system/WCF.class.php            | 4 ++++
 wcfsetup/install/lang/de.xml                               | 1 -
 wcfsetup/install/lang/en.xml                               | 1 -
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index b13615bde03..2a82335759e 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1263,12 +1263,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 				<minvalue>0</minvalue>
 				<suffix>seconds</suffix>
 			</option>
-			<option name="users_online_record_no_guests">
-				<categoryname>user.list.online</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>1</defaultvalue>
-				<options>module_users_online</options>
-			</option>
 			<option name="users_online_enable_legend">
 				<categoryname>user.list.online</categoryname>
 				<optiontype>boolean</optiontype>
@@ -1618,5 +1612,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 		<option name="module_amp"/>
 		<option name="article_enable_visit_tracking"/>
 		<option name="enable_woltlab_news"/>
+		<option name="users_online_record_no_guests"/>
 	</delete>
 </data>
diff --git a/constants.php b/constants.php
index 3832ab3bfb0..1bb51d0e497 100644
--- a/constants.php
+++ b/constants.php
@@ -138,7 +138,6 @@
 \define('USERS_ONLINE_DEFAULT_SORT_FIELD', 'lastActivityTime');
 \define('USERS_ONLINE_DEFAULT_SORT_ORDER', 'DESC');
 \define('USERS_ONLINE_PAGE_REFRESH', 0);
-\define('USERS_ONLINE_RECORD_NO_GUESTS', 1);
 \define('USERS_ONLINE_ENABLE_LEGEND', 1);
 \define('USERS_ONLINE_RECORD', 1);
 \define('USERS_ONLINE_RECORD_TIME', 0);
diff --git a/wcfsetup/install/files/lib/data/user/online/UsersOnlineList.class.php b/wcfsetup/install/files/lib/data/user/online/UsersOnlineList.class.php
index 6f4d0c35096..ed896143783 100644
--- a/wcfsetup/install/files/lib/data/user/online/UsersOnlineList.class.php
+++ b/wcfsetup/install/files/lib/data/user/online/UsersOnlineList.class.php
@@ -165,7 +165,7 @@ public function getUsersOnlineMarkings()
      */
     public function checkRecord()
     {
-        $usersOnlineTotal = (USERS_ONLINE_RECORD_NO_GUESTS ? $this->stats['members'] : $this->stats['total']);
+        $usersOnlineTotal = $this->stats['members'];
         if ($usersOnlineTotal > USERS_ONLINE_RECORD) {
             // save new record
             $optionAction = new OptionAction([], 'import', [
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index f26820f727b..f7fe627d744 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -495,6 +495,10 @@ protected function defineLegacyOptions(): void
         \define('GOOGLE_MAPS_ENABLE_SCROLL_WHEEL_ZOOM', 0);
         \define('GOOGLE_MAPS_ENABLE_DOUBLE_CLICK_ZOOM', 1);
         \define('GOOGLE_MAPS_ACCESS_USER_LOCATION', 1);
+
+        // The option to count guests in the online record was removed with version 6.1.
+        // https://github.com/WoltLab/WCF/issues/5888
+        \define('USERS_ONLINE_RECORD_NO_GUESTS', 1);
     }
 
     /**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index d4efa6bd332..97f0e73090e 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1569,7 +1569,6 @@ Die Beschränkung auf ASCII-Zeichen erlaubt in Benutzernamen lediglich lateinisc
 Beispiele:<br>
 WBB=WoltLab Burning Board<br>
 GmbH=Gesellschaft mit beschränkter Haftung]]></item>
-		<item name="wcf.acp.option.users_online_record_no_guests"><![CDATA[Nur registrierte Benutzer im Benutzer-Online-Rekord zählen]]></item>
 		<item name="wcf.acp.option.users_online_enable_legend"><![CDATA[Legende der Benutzergruppen anzeigen]]></item>
 		<item name="wcf.acp.option.category.general.system.googleMaps"><![CDATA[Google Maps]]></item>
 		<item name="wcf.acp.option.google_maps_zoom"><![CDATA[Karten-Zoom]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 1ac577e011b..9d1025127b5 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1507,7 +1507,6 @@ Restricting usernames to ASCII characters restricts usernames to latin letters,
 		<item name="wcf.acp.option.users_online_default_sort_order.description"><![CDATA[Choose default sort order of “Users Online” list.]]></item>
 		<item name="wcf.acp.option.users_online_page_refresh"><![CDATA[Refresh Page]]></item>
 		<item name="wcf.acp.option.users_online_page_refresh.description"><![CDATA[Refreshes “Users Online” in the following seconds. Use 0 to disable.]]></item>
-		<item name="wcf.acp.option.users_online_record_no_guests"><![CDATA[Exclude guests from the most users online record]]></item>
 		<item name="wcf.acp.option.user_cleanup_notification_lifetime"><![CDATA[Notifications]]></item>
 		<item name="wcf.acp.option.user_cleanup_notification_lifetime.description"><![CDATA[Notifications will be removed after the following days.]]></item>
 		<item name="wcf.acp.option.user_cleanup_activity_event_lifetime"><![CDATA[Recent Activity]]></item>