From 2aa5fa8eb722b1d57c0f88792010c3f5f44fcfa6 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 8 Sep 2026 13:42:17 +0200
Subject: [PATCH 01/10] Register sitemap objects through an event instead of
 object types

---
 com.woltlab.wcf/objectType.xml                |  58 ++------
 com.woltlab.wcf/objectTypeDefinition.xml      |   1 +
 .../files/acp/templates/sitemapEdit.tpl       |   2 +-
 .../files/acp/templates/sitemapList.tpl       |  36 +++--
 .../lib/acp/form/SitemapEditForm.class.php    |  98 ++++--------
 .../lib/acp/page/SitemapListPage.class.php    |  56 ++++---
 .../files/lib/bootstrap/com.woltlab.wcf.php   |  34 +++++
 .../type/SitemapObjectTypeAction.class.php    |   9 +-
 .../sitemap/SitemapObjectCollecting.class.php |  48 ++++++
 .../sitemaps/DisableSitemapObject.class.php   |  39 +++++
 .../sitemaps/EnableSitemapObject.class.php    |  39 +++++
 ...ectTypePackageInstallationPlugin.class.php |   1 +
 .../system/sitemap/SitemapHandler.class.php   | 139 ++++++++++++++++++
 .../AbstractSitemapObjectObjectType.class.php |   5 +-
 .../ArticleCategorySitemapObject.class.php    |   2 +-
 .../object/ArticleSitemapObject.class.php     |   4 +-
 .../object/ISitemapObjectObjectType.class.php |   6 +-
 .../MultilingualPageSitemapObject.class.php   |   4 +-
 .../object/RegisteredSitemapObject.class.php  | 125 ++++++++++++++++
 .../object/SimplePageSitemapObject.class.php  |   4 +-
 .../object/UserSitemapObject.class.php        |   2 +-
 .../worker/SitemapRebuildWorker.class.php     |  92 ++++--------
 22 files changed, 571 insertions(+), 233 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/event/sitemap/SitemapObjectCollecting.class.php
 create mode 100644 wcfsetup/install/files/lib/system/endpoint/controller/core/sitemaps/DisableSitemapObject.class.php
 create mode 100644 wcfsetup/install/files/lib/system/endpoint/controller/core/sitemaps/EnableSitemapObject.class.php
 create mode 100644 wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php
 create mode 100644 wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 98a85379f0a..96005e4c674 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -1621,48 +1621,6 @@
 			<classname>wcf\system\category\MediaCategoryType</classname>
 		</type>
 		<!-- /media -->
-		<!-- sitemap -->
-		<type>
-			<name>com.woltlab.wcf.sitemap.object.user</name>
-			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
-			<classname>wcf\system\sitemap\object\UserSitemapObject</classname>
-			<priority>0.5</priority>
-			<changeFreq>monthly</changeFreq>
-			<rebuildTime>259200</rebuildTime>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.sitemap.object.articleCategory</name>
-			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
-			<classname>wcf\system\sitemap\object\ArticleCategorySitemapObject</classname>
-			<priority>0.5</priority>
-			<changeFreq>weekly</changeFreq>
-			<rebuildTime>2592000</rebuildTime>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.sitemap.object.article</name>
-			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
-			<classname>wcf\system\sitemap\object\ArticleSitemapObject</classname>
-			<priority>0.5</priority>
-			<changeFreq>monthly</changeFreq>
-			<rebuildTime>259200</rebuildTime>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.sitemap.object.simplePage</name>
-			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
-			<classname>wcf\system\sitemap\object\SimplePageSitemapObject</classname>
-			<priority>0.5</priority>
-			<changeFreq>monthly</changeFreq>
-			<rebuildTime>604800</rebuildTime>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.sitemap.object.multilingualPage</name>
-			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
-			<classname>wcf\system\sitemap\object\MultilingualPageSitemapObject</classname>
-			<priority>0.5</priority>
-			<changeFreq>monthly</changeFreq>
-			<rebuildTime>604800</rebuildTime>
-		</type>
-		<!-- /sitemap -->
 		<!-- trophy -->
 		<type>
 			<name>com.woltlab.wcf.trophy.category</name>
@@ -1798,6 +1756,22 @@
 		<!-- /deprecated -->
 	</import>
 	<delete>
+		<!-- sitemap objects are registered through `wcf\event\sitemap\SitemapObjectCollecting` since 6.3 -->
+		<type name="com.woltlab.wcf.sitemap.object.user">
+			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.sitemap.object.articleCategory">
+			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.sitemap.object.article">
+			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.sitemap.object.simplePage">
+			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.sitemap.object.multilingualPage">
+			<definitionname>com.woltlab.wcf.sitemap.object</definitionname>
+		</type>
 		<type name="com.woltlab.wcf.like">
 			<definitionname>com.woltlab.wcf.rebuildData</definitionname>
 		</type>
diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml
index 8ea654c528d..f3bd5c6159b 100644
--- a/com.woltlab.wcf/objectTypeDefinition.xml
+++ b/com.woltlab.wcf/objectTypeDefinition.xml
@@ -205,6 +205,7 @@
 			<interfacename>wcf\system\condition\IObjectListCondition</interfacename>
 		</definition>
 		<!-- /box conditions -->
+		<!-- deprecated 6.3, use `wcf\event\sitemap\SitemapObjectCollecting` instead -->
 		<definition>
 			<name>com.woltlab.wcf.sitemap.object</name>
 			<interfacename>wcf\system\sitemap\object\ISitemapObjectObjectType</interfacename>
diff --git a/wcfsetup/install/files/acp/templates/sitemapEdit.tpl b/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
index b07984cf399..4bcdd8ad849 100755
--- a/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
@@ -3,7 +3,7 @@
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
 		<h1 class="contentTitle">{lang}wcf.acp.sitemap.edit{/lang}</h1>
-		<p class="contentHeaderDescription">{lang}wcf.acp.sitemap.objectType.{$formObject->objectType}{/lang}</p>
+		<p class="contentHeaderDescription">{$sitemapObject->getName()}</p>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/sitemapList.tpl b/wcfsetup/install/files/acp/templates/sitemapList.tpl
index 16bc8e26c2b..bcfb86b6ec5 100644
--- a/wcfsetup/install/files/acp/templates/sitemapList.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapList.tpl
@@ -18,9 +18,9 @@
 
 <woltlab-core-notice type="info">{lang}wcf.acp.sitemap.cliInfo{/lang}</woltlab-core-notice>
 
-{if $sitemapObjectTypes|count}
+{if $sitemapObjects|count}
 	<div class="section tabularBox">
-		<table class="table jsObjectActionContainer" data-object-action-class-name="wcf\data\object\type\SitemapObjectTypeAction">
+		<table id="sitemapObjectList" class="table">
 			<thead>
 				<tr>
 					<th class="columnTitle columnSitemap" colspan="2">{lang}wcf.acp.sitemap{/lang}</th>
@@ -33,20 +33,22 @@
 			</thead>
 			
 			<tbody>
-				{foreach from=$sitemapObjectTypes item=object}
-					<tr class="sitemapObjectRow jsObjectActionObject" data-object-id="{$object->getObjectID()}">
+				{foreach from=$sitemapObjects key=objectName item=object}
+					<tr class="sitemapObjectRow">
 						<td class="columnIcon">
-							{if $sitemapData[$object->objectType]['isDisabled']}
-								{objectAction action="toggle" isDisabled=true}
-							{else}
-								{objectAction action="toggle" isDisabled=false}
-							{/if}
-							<a href="{link controller="SitemapEdit"}objectType={$object->objectType}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon name='pencil'}</a>
+							<woltlab-core-toggle-button
+								data-interaction="sitemapObjectToggle"
+								aria-label="{lang}wcf.global.button.enable{/lang}"
+								data-enable-endpoint="{$sitemapData[$objectName]['enableEndpoint']}"
+								data-disable-endpoint="{$sitemapData[$objectName]['disableEndpoint']}"
+								{if !$sitemapData[$objectName]['isDisabled']}checked{/if}
+							></woltlab-core-toggle-button>
+							<a href="{link controller="SitemapEdit"}objectType={$objectName}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon name='pencil'}</a>
 						</td>
-						<td class="columnTitle columnSitemap"><a href="{link controller="SitemapEdit"}objectType={$object->objectType}{/link}">{lang}wcf.acp.sitemap.objectType.{$object->objectType}{/lang}</a></td>
-						<td class="columnInteger columnPriority">{$object->priority}</td>
-						<td class="columnText columnChangeFreq">{lang}wcf.acp.sitemap.changeFreq.{$sitemapData[$object->objectType]['changeFreq']}{/lang}</td>
-						<td class="columnInteger columnRebuildTime">{dateInterval end=TIME_NOW+$sitemapData[$object->objectType]['rebuildTime'] full=true format='plain'}</td>
+						<td class="columnTitle columnSitemap"><a href="{link controller="SitemapEdit"}objectType={$objectName}{/link}">{$object->getName()}</a></td>
+						<td class="columnInteger columnPriority">{$object->getPriority()}</td>
+						<td class="columnText columnChangeFreq">{lang}wcf.acp.sitemap.changeFreq.{$sitemapData[$objectName]['changeFreq']}{/lang}</td>
+						<td class="columnInteger columnRebuildTime">{dateInterval end=TIME_NOW+$sitemapData[$objectName]['rebuildTime'] full=true format='plain'}</td>
 						
 						{event name='columns'}
 					</tr>
@@ -64,6 +66,12 @@
 			</nav>
 		{/hascontent}
 	</footer>
+	
+	<script data-relocate="true">
+		require(['WoltLabSuite/Core/Component/Interaction/Toggle'], ({ setup }) => {
+			setup('sitemapObjectToggle', document.getElementById('sitemapObjectList'));
+		});
+	</script>
 {else}
 	<woltlab-core-notice type="info">{lang}wcf.global.noItems{/lang}</woltlab-core-notice>
 {/if}
diff --git a/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php b/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php
index 0eb8c12a30f..f59f380f1cf 100755
--- a/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php
@@ -3,23 +3,19 @@
 namespace wcf\acp\form;
 
 use CuyZ\Valinor\Mapper\MappingError;
-use wcf\data\IStorableObject;
-use wcf\data\object\type\ObjectType;
-use wcf\data\object\type\ObjectTypeCache;
 use wcf\form\AbstractForm;
 use wcf\form\AbstractFormBuilderForm;
 use wcf\http\Helper;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\form\builder\container\FormContainer;
-use wcf\system\form\builder\data\processor\CustomFormDataProcessor;
 use wcf\system\form\builder\field\BooleanFormField;
 use wcf\system\form\builder\field\IntegerFormField;
 use wcf\system\form\builder\field\SingleSelectionFormField;
 use wcf\system\form\builder\IFormDocument;
-use wcf\system\registry\RegistryHandler;
 use wcf\system\request\LinkHandler;
+use wcf\system\sitemap\object\RegisteredSitemapObject;
+use wcf\system\sitemap\SitemapHandler;
 use wcf\system\WCF;
-use wcf\system\worker\SitemapRebuildWorker;
 
 /**
  * Shows the sitemap edit form.
@@ -28,7 +24,7 @@
  * @copyright   2001-2024 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @extends AbstractFormBuilderForm<ObjectType>
+ * @extends AbstractFormBuilderForm<null>
  */
 class SitemapEditForm extends AbstractFormBuilderForm
 {
@@ -48,9 +44,9 @@ class SitemapEditForm extends AbstractFormBuilderForm
     public $neededPermissions = ['admin.management.canRebuildData'];
 
     /**
-     * @inheritDoc
+     * @since 6.3
      */
-    public $formAction = 'edit';
+    public RegisteredSitemapObject $sitemapObject;
 
     #[\Override]
     public function readParameters()
@@ -70,14 +66,12 @@ public function readParameters()
             throw new IllegalLinkException();
         }
 
-        $this->formObject = ObjectTypeCache::getInstance()->getObjectTypeByName(
-            'com.woltlab.wcf.sitemap.object',
-            $queryParameters['objectType']
-        );
-
-        if ($this->formObject === null) {
+        $sitemapObject = SitemapHandler::getInstance()->getObject($queryParameters['objectType']);
+        if ($sitemapObject === null) {
             throw new IllegalLinkException();
         }
+
+        $this->sitemapObject = $sitemapObject;
     }
 
     #[\Override]
@@ -85,6 +79,8 @@ protected function createForm()
     {
         parent::createForm();
 
+        $this->form->formMode(IFormDocument::FORM_MODE_UPDATE);
+
         $this->form->appendChildren([
             FormContainer::create('section')
                 ->appendChildren([
@@ -99,87 +95,55 @@ protected function createForm()
                             'yearly' => 'wcf.acp.sitemap.changeFreq.yearly',
                             'never' => 'wcf.acp.sitemap.changeFreq.never',
                         ])
-                        ->value('monthly')
+                        ->value(SitemapHandler::getInstance()->getChangeFreq($this->sitemapObject))
                         ->required(),
                     IntegerFormField::create('rebuildTime')
                         ->label('wcf.acp.sitemap.rebuildTime')
                         ->description('wcf.acp.sitemap.rebuildTime.description')
                         ->suffix('wcf.acp.option.suffix.seconds')
                         ->minimum(0)
-                        ->value(172800)
+                        ->value(SitemapHandler::getInstance()->getRebuildTime($this->sitemapObject))
                         ->addFieldClass('short'),
                     BooleanFormField::create('isDisabled')
                         ->label('wcf.acp.sitemap.isDisabled')
+                        ->value(SitemapHandler::getInstance()->isDisabled($this->sitemapObject))
                 ])
         ]);
     }
 
-    #[\Override]
-    protected function finalizeForm()
-    {
-        parent::finalizeForm();
-
-        $this->form->getDataHandler()
-            ->addProcessor(
-                new CustomFormDataProcessor(
-                    'registryDataProcessor',
-                    null,
-                    function (IFormDocument $document, array $data, IStorableObject $object) {
-                        \assert($object instanceof ObjectType);
-                        $sitemapData = RegistryHandler::getInstance()->get(
-                            'com.woltlab.wcf',
-                            SitemapRebuildWorker::REGISTRY_PREFIX . $object->objectType
-                        );
-                        $sitemapData = @\unserialize($sitemapData);
-
-                        if (\is_array($sitemapData)) {
-                            $data["changeFreq"] = $sitemapData['changeFreq'];
-                            $data["rebuildTime"] = $sitemapData['rebuildTime'];
-                            $data["isDisabled"] = $sitemapData['isDisabled'];
-                        } else {
-                            if ($object->changeFreq !== null) {
-                                $data["changeFreq"] = $object->changeFreq;
-                            }
-                            if ($object->rebuildTime !== null) {
-                                $data["rebuildTime"] = $object->rebuildTime;
-                            }
-                            if ($object->isDisabled !== null) {
-                                $data["isDisabled"] = $object->isDisabled;
-                            }
-                        }
-
-                        return $data;
-                    }
-                )
-            );
-    }
-
     #[\Override]
     public function save()
     {
         AbstractForm::save();
 
-        $formData = $this->form->getData();
-        if (!isset($formData['data'])) {
-            $formData['data'] = [];
-        }
-        $formData['data'] = \array_merge($this->additionalFields, $formData['data']);
+        $formData = $this->form->getData()['data'] ?? [];
 
-        RegistryHandler::getInstance()->set(
-            'com.woltlab.wcf',
-            SitemapRebuildWorker::REGISTRY_PREFIX . $this->formObject->objectType,
-            \serialize($formData['data'])
+        SitemapHandler::getInstance()->setConfiguration(
+            $this->sitemapObject,
+            $formData['changeFreq'],
+            (int)$formData['rebuildTime'],
+            (bool)$formData['isDisabled']
         );
 
         $this->saved();
         WCF::getTPL()->assign('success', true);
     }
 
+    #[\Override]
+    public function assignVariables()
+    {
+        parent::assignVariables();
+
+        WCF::getTPL()->assign([
+            'sitemapObject' => $this->sitemapObject,
+        ]);
+    }
+
     #[\Override]
     protected function setFormAction()
     {
         $this->form->action(LinkHandler::getInstance()->getControllerLink(static::class, [
-            'objectType' => $this->formObject->objectType
+            'objectType' => $this->sitemapObject->getObjectName()
         ]));
     }
 }
diff --git a/wcfsetup/install/files/lib/acp/page/SitemapListPage.class.php b/wcfsetup/install/files/lib/acp/page/SitemapListPage.class.php
index a06ec2017ab..7de3a7a45ba 100755
--- a/wcfsetup/install/files/lib/acp/page/SitemapListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/SitemapListPage.class.php
@@ -2,15 +2,15 @@
 
 namespace wcf\acp\page;
 
-use wcf\data\object\type\ObjectType;
-use wcf\data\object\type\ObjectTypeCache;
+use wcf\action\ApiAction;
 use wcf\page\AbstractPage;
-use wcf\system\registry\RegistryHandler;
+use wcf\system\request\LinkHandler;
+use wcf\system\sitemap\object\RegisteredSitemapObject;
+use wcf\system\sitemap\SitemapHandler;
 use wcf\system\WCF;
-use wcf\system\worker\SitemapRebuildWorker;
 
 /**
- * Shows a list of sitemap object types.
+ * Shows a list of sitemap objects.
  *
  * @author  Joshua Ruesweg
  * @copyright   2001-2019 WoltLab GmbH
@@ -29,9 +29,10 @@ class SitemapListPage extends AbstractPage
     public $neededPermissions = ['admin.management.canRebuildData'];
 
     /**
-     * @var array<ObjectType>
+     * @var array<string, RegisteredSitemapObject>
+     * @since 6.3
      */
-    public $sitemapObjectTypes = [];
+    public $sitemapObjects = [];
 
     /**
      * @var mixed[]
@@ -43,29 +44,26 @@ public function readData()
     {
         parent::readData();
 
-        $this->sitemapObjectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.sitemap.object');
+        $this->sitemapObjects = SitemapHandler::getInstance()->getObjects();
 
-        foreach ($this->sitemapObjectTypes as $sitemapObjectType) {
-            $this->sitemapData[$sitemapObjectType->objectType] = [
-                'changeFreq' => $sitemapObjectType->changeFreq,
-                'rebuildTime' => $sitemapObjectType->rebuildTime,
-                'isDisabled' => 0,
-            ];
-
-            $sitemapData = RegistryHandler::getInstance()->get(
-                'com.woltlab.wcf',
-                SitemapRebuildWorker::REGISTRY_PREFIX . $sitemapObjectType->objectType
-            );
+        $apiUrl = LinkHandler::getInstance()->getControllerLink(ApiAction::class, ['id' => 'rpc']);
 
-            if ($sitemapData !== null) {
-                $sitemapData = @\unserialize($sitemapData);
-
-                if (\is_array($sitemapData)) {
-                    $this->sitemapData[$sitemapObjectType->objectType]['changeFreq'] = $sitemapData['changeFreq'];
-                    $this->sitemapData[$sitemapObjectType->objectType]['rebuildTime'] = $sitemapData['rebuildTime'];
-                    $this->sitemapData[$sitemapObjectType->objectType]['isDisabled'] = $sitemapData['isDisabled'];
-                }
-            }
+        foreach ($this->sitemapObjects as $sitemapObject) {
+            $this->sitemapData[$sitemapObject->getObjectName()] = [
+                'changeFreq' => SitemapHandler::getInstance()->getChangeFreq($sitemapObject),
+                'rebuildTime' => SitemapHandler::getInstance()->getRebuildTime($sitemapObject),
+                'isDisabled' => SitemapHandler::getInstance()->isDisabled($sitemapObject),
+                'enableEndpoint' => \sprintf(
+                    '%score/sitemaps/%s/enable',
+                    $apiUrl,
+                    \rawurlencode($sitemapObject->getObjectName())
+                ),
+                'disableEndpoint' => \sprintf(
+                    '%score/sitemaps/%s/disable',
+                    $apiUrl,
+                    \rawurlencode($sitemapObject->getObjectName())
+                ),
+            ];
         }
     }
 
@@ -75,7 +73,7 @@ public function assignVariables()
         parent::assignVariables();
 
         WCF::getTPL()->assign([
-            'sitemapObjectTypes' => $this->sitemapObjectTypes,
+            'sitemapObjects' => $this->sitemapObjects,
             'sitemapData' => $this->sitemapData,
         ]);
     }
diff --git a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
index 5353482f78b..9261b7ed704 100644
--- a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
+++ b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
@@ -13,6 +13,7 @@
     public function __invoke(): void
     {
         $this->initEventListeners();
+        $this->initSitemapObjects();
         $this->initACPMenuItems();
         $this->initACPSearchProviders();
         $this->initLicenseData();
@@ -126,6 +127,39 @@ static function (\wcf\event\acp\dashboard\box\BoxCollecting $event) {
         );
     }
 
+    private function initSitemapObjects(): void
+    {
+        EventHandler::getInstance()->register(
+            \wcf\event\sitemap\SitemapObjectCollecting::class,
+            static function (\wcf\event\sitemap\SitemapObjectCollecting $event) {
+                $event->register(new \wcf\system\sitemap\object\RegisteredSitemapObject(
+                    'com.woltlab.wcf.sitemap.object.user',
+                    new \wcf\system\sitemap\object\UserSitemapObject(),
+                    rebuildTime: 259200,
+                ));
+                $event->register(new \wcf\system\sitemap\object\RegisteredSitemapObject(
+                    'com.woltlab.wcf.sitemap.object.articleCategory',
+                    new \wcf\system\sitemap\object\ArticleCategorySitemapObject(),
+                    changeFreq: 'weekly',
+                    rebuildTime: 2592000,
+                ));
+                $event->register(new \wcf\system\sitemap\object\RegisteredSitemapObject(
+                    'com.woltlab.wcf.sitemap.object.article',
+                    new \wcf\system\sitemap\object\ArticleSitemapObject(),
+                    rebuildTime: 259200,
+                ));
+                $event->register(new \wcf\system\sitemap\object\RegisteredSitemapObject(
+                    'com.woltlab.wcf.sitemap.object.simplePage',
+                    new \wcf\system\sitemap\object\SimplePageSitemapObject(),
+                ));
+                $event->register(new \wcf\system\sitemap\object\RegisteredSitemapObject(
+                    'com.woltlab.wcf.sitemap.object.multilingualPage',
+                    new \wcf\system\sitemap\object\MultilingualPageSitemapObject(),
+                ));
+            }
+        );
+    }
+
     private function initACPMenuItems(): void
     {
         EventHandler::getInstance()->register(
diff --git a/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php b/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php
index b2d492d4e7e..4d738ddebb5 100644
--- a/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php
+++ b/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php
@@ -5,8 +5,8 @@
 use wcf\data\IToggleAction;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\registry\RegistryHandler;
+use wcf\system\sitemap\SitemapHandler;
 use wcf\system\WCF;
-use wcf\system\worker\SitemapRebuildWorker;
 
 /**
  * Executes sitemap object type-related actions.
@@ -18,6 +18,9 @@
  * @method  ObjectType      create()
  * @method  ObjectTypeEditor[]  getObjects()
  * @method  ObjectTypeEditor    getSingleObject()
+ *
+ * @deprecated 6.3 Sitemap objects are toggled through the endpoints
+ *             `core/sitemaps/{objectName}/enable` and `core/sitemaps/{objectName}/disable`.
  */
 class SitemapObjectTypeAction extends ObjectTypeAction implements IToggleAction
 {
@@ -37,7 +40,7 @@ public function toggle()
         foreach ($this->getObjects() as $objectEditor) {
             $sitemapData = RegistryHandler::getInstance()->get(
                 'com.woltlab.wcf',
-                SitemapRebuildWorker::REGISTRY_PREFIX . $objectEditor->objectType
+                SitemapHandler::REGISTRY_PREFIX . $objectEditor->objectType
             );
             $sitemapData = @\unserialize($sitemapData);
 
@@ -54,7 +57,7 @@ public function toggle()
 
             RegistryHandler::getInstance()->set(
                 'com.woltlab.wcf',
-                SitemapRebuildWorker::REGISTRY_PREFIX . $objectEditor->objectType,
+                SitemapHandler::REGISTRY_PREFIX . $objectEditor->objectType,
                 \serialize($sitemapData)
             );
         }
diff --git a/wcfsetup/install/files/lib/event/sitemap/SitemapObjectCollecting.class.php b/wcfsetup/install/files/lib/event/sitemap/SitemapObjectCollecting.class.php
new file mode 100644
index 00000000000..a7d42341c3d
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/sitemap/SitemapObjectCollecting.class.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace wcf\event\sitemap;
+
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\event\IPsr14Event;
+use wcf\system\sitemap\object\RegisteredSitemapObject;
+
+/**
+ * Requests the collection of objects that should be included in the sitemap.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class SitemapObjectCollecting implements IPsr14Event
+{
+    /**
+     * @var array<string, RegisteredSitemapObject>
+     */
+    private array $objects = [];
+
+    public function __construct()
+    {
+        // Support for the deprecated object type definition `com.woltlab.wcf.sitemap.object`.
+        $objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.sitemap.object');
+        foreach ($objectTypes as $objectType) {
+            $this->register(RegisteredSitemapObject::fromObjectType($objectType));
+        }
+    }
+
+    /**
+     * Registers a new sitemap object.
+     */
+    public function register(RegisteredSitemapObject $object): void
+    {
+        $this->objects[$object->getObjectName()] = $object;
+    }
+
+    /**
+     * @return array<string, RegisteredSitemapObject>
+     */
+    public function getObjects(): array
+    {
+        return $this->objects;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/sitemaps/DisableSitemapObject.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/sitemaps/DisableSitemapObject.class.php
new file mode 100644
index 00000000000..662674c3003
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/sitemaps/DisableSitemapObject.class.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace wcf\system\endpoint\controller\core\sitemaps;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use wcf\system\endpoint\IController;
+use wcf\system\endpoint\PostRequest;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\sitemap\SitemapHandler;
+use wcf\system\WCF;
+
+/**
+ * Disables the sitemap object with the given name.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+#[PostRequest('/core/sitemaps/{id}/disable')]
+final class DisableSitemapObject implements IController
+{
+    #[\Override]
+    public function __invoke(ServerRequestInterface $request, array $variables): ResponseInterface
+    {
+        WCF::getSession()->checkPermissions(['admin.management.canRebuildData']);
+
+        $sitemapObject = SitemapHandler::getInstance()->getObject($variables['id']);
+        if ($sitemapObject === null) {
+            throw new IllegalLinkException();
+        }
+
+        SitemapHandler::getInstance()->setIsDisabled($sitemapObject, true);
+
+        return new JsonResponse([]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/sitemaps/EnableSitemapObject.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/sitemaps/EnableSitemapObject.class.php
new file mode 100644
index 00000000000..2d8a4f23378
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/sitemaps/EnableSitemapObject.class.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace wcf\system\endpoint\controller\core\sitemaps;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use wcf\system\endpoint\IController;
+use wcf\system\endpoint\PostRequest;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\sitemap\SitemapHandler;
+use wcf\system\WCF;
+
+/**
+ * Enables the sitemap object with the given name.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+#[PostRequest('/core/sitemaps/{id}/enable')]
+final class EnableSitemapObject implements IController
+{
+    #[\Override]
+    public function __invoke(ServerRequestInterface $request, array $variables): ResponseInterface
+    {
+        WCF::getSession()->checkPermissions(['admin.management.canRebuildData']);
+
+        $sitemapObject = SitemapHandler::getInstance()->getObject($variables['id']);
+        if ($sitemapObject === null) {
+            throw new IllegalLinkException();
+        }
+
+        SitemapHandler::getInstance()->setIsDisabled($sitemapObject, false);
+
+        return new JsonResponse([]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
index 9e5ddee6ce4..1b35c5d4b7c 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
@@ -657,6 +657,7 @@ static function (UserGroupOptionFormField $formField) {
         $this->definitionElementChildren['com.woltlab.wcf.searchableObjectType'] = ['searchindex'];
 
         // com.woltlab.wcf.sitemap.object
+        // @deprecated 6.3 use `wcf\event\sitemap\SitemapObjectCollecting` instead
         $this->getObjectTypeDefinitionDataContainer($form, 'com.woltlab.wcf.sitemap.object')
             ->appendChildren([
                 FloatFormField::create('sitemapObjectPriority')
diff --git a/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php b/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php
new file mode 100644
index 00000000000..d7016f3ad16
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace wcf\system\sitemap;
+
+use wcf\event\sitemap\SitemapObjectCollecting;
+use wcf\system\event\EventHandler;
+use wcf\system\registry\RegistryHandler;
+use wcf\system\SingletonFactory;
+use wcf\system\sitemap\object\RegisteredSitemapObject;
+
+/**
+ * Provides the sitemap objects and their configuration.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class SitemapHandler extends SingletonFactory
+{
+    /**
+     * Prefix for the configuration stored in the registry.
+     */
+    public const REGISTRY_PREFIX = 'sitemapData_';
+
+    /**
+     * @var array<string, RegisteredSitemapObject>
+     */
+    private array $objects;
+
+    #[\Override]
+    protected function init(): void
+    {
+        $event = new SitemapObjectCollecting();
+        EventHandler::getInstance()->fire($event);
+
+        $this->objects = $event->getObjects();
+    }
+
+    /**
+     * @return array<string, RegisteredSitemapObject>
+     */
+    public function getObjects(): array
+    {
+        return $this->objects;
+    }
+
+    public function getObject(string $objectName): ?RegisteredSitemapObject
+    {
+        return $this->objects[$objectName] ?? null;
+    }
+
+    /**
+     * Returns the change frequency of the given object, taking the
+     * configuration of the administrator into account.
+     */
+    public function getChangeFreq(RegisteredSitemapObject $object): string
+    {
+        $data = $this->getConfiguration($object->getObjectName());
+
+        return isset($data['changeFreq']) ? (string)$data['changeFreq'] : $object->getChangeFreq();
+    }
+
+    /**
+     * Returns the rebuild time of the given object, taking the
+     * configuration of the administrator into account.
+     */
+    public function getRebuildTime(RegisteredSitemapObject $object): int
+    {
+        $data = $this->getConfiguration($object->getObjectName());
+
+        return isset($data['rebuildTime']) ? (int)$data['rebuildTime'] : $object->getRebuildTime();
+    }
+
+    /**
+     * Returns whether the given object has been disabled by the administrator.
+     */
+    public function isDisabled(RegisteredSitemapObject $object): bool
+    {
+        $data = $this->getConfiguration($object->getObjectName());
+
+        return isset($data['isDisabled']) ? (bool)$data['isDisabled'] : $object->isDisabled();
+    }
+
+    /**
+     * Stores the configuration of the given object.
+     */
+    public function setConfiguration(
+        RegisteredSitemapObject $object,
+        string $changeFreq,
+        int $rebuildTime,
+        bool $isDisabled
+    ): void {
+        RegistryHandler::getInstance()->set(
+            'com.woltlab.wcf',
+            self::REGISTRY_PREFIX . $object->getObjectName(),
+            \serialize([
+                'changeFreq' => $changeFreq,
+                'rebuildTime' => $rebuildTime,
+                'isDisabled' => $isDisabled ? 1 : 0,
+            ])
+        );
+    }
+
+    /**
+     * Enables or disables the given object.
+     */
+    public function setIsDisabled(RegisteredSitemapObject $object, bool $isDisabled): void
+    {
+        $this->setConfiguration(
+            $object,
+            $this->getChangeFreq($object),
+            $this->getRebuildTime($object),
+            $isDisabled
+        );
+    }
+
+    /**
+     * The configuration is read from the registry and may have been written by
+     * an older version, therefore the type of the values is not guaranteed.
+     *
+     * @return array<string, mixed>
+     */
+    private function getConfiguration(string $objectName): array
+    {
+        $data = RegistryHandler::getInstance()->get(
+            'com.woltlab.wcf',
+            self::REGISTRY_PREFIX . $objectName
+        );
+
+        if ($data === null) {
+            return [];
+        }
+
+        $data = @\unserialize($data);
+
+        return \is_array($data) ? $data : [];
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/AbstractSitemapObjectObjectType.class.php b/wcfsetup/install/files/lib/system/sitemap/object/AbstractSitemapObjectObjectType.class.php
index d57f11ade0d..d521e41214b 100755
--- a/wcfsetup/install/files/lib/system/sitemap/object/AbstractSitemapObjectObjectType.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/AbstractSitemapObjectObjectType.class.php
@@ -12,9 +12,8 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @template TDatabaseObject of DatabaseObject
- * @template TDatabaseObjectList of DatabaseObjectList
- * @implements ISitemapObjectObjectType<TDatabaseObject, TDatabaseObjectList>
+ * @template-covariant TDatabaseObjectList of DatabaseObjectList
+ * @implements ISitemapObjectObjectType<TDatabaseObjectList>
  */
 abstract class AbstractSitemapObjectObjectType implements ISitemapObjectObjectType
 {
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/ArticleCategorySitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/ArticleCategorySitemapObject.class.php
index eead59d512f..cd2f8ab7116 100644
--- a/wcfsetup/install/files/lib/system/sitemap/object/ArticleCategorySitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/ArticleCategorySitemapObject.class.php
@@ -15,7 +15,7 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @phpstan-ignore missingType.generics
+ * @extends AbstractSitemapObjectObjectType<CategoryList>
  */
 class ArticleCategorySitemapObject extends AbstractSitemapObjectObjectType
 {
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/ArticleSitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/ArticleSitemapObject.class.php
index e0a6cc31c99..15d7fb1ff69 100644
--- a/wcfsetup/install/files/lib/system/sitemap/object/ArticleSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/ArticleSitemapObject.class.php
@@ -14,7 +14,7 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @extends AbstractSitemapObjectObjectType<ArticleContent, ArticleContentList>
+ * @extends AbstractSitemapObjectObjectType<ArticleContentList>
  */
 class ArticleSitemapObject extends AbstractSitemapObjectObjectType
 {
@@ -27,6 +27,8 @@ public function getObjectClass()
     #[\Override]
     public function canView(DatabaseObject $object)
     {
+        \assert($object instanceof ArticleContent);
+
         return $object->getArticle()->canRead();
     }
 
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/ISitemapObjectObjectType.class.php b/wcfsetup/install/files/lib/system/sitemap/object/ISitemapObjectObjectType.class.php
index 5bb66b1b48a..3902dbd8875 100755
--- a/wcfsetup/install/files/lib/system/sitemap/object/ISitemapObjectObjectType.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/ISitemapObjectObjectType.class.php
@@ -12,8 +12,7 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @template TDatabaseObject of DatabaseObject
- * @template TDatabaseObjectList of DatabaseObjectList
+ * @template-covariant TDatabaseObjectList of DatabaseObjectList
  */
 interface ISitemapObjectObjectType
 {
@@ -49,7 +48,8 @@ public function getLastModifiedColumn();
     /**
      * Returns the permission for a guest to view a certain object for this object type.
      *
-     * @param TDatabaseObject $object
+     * The object is always an instance of the class returned by `getObjectClass()`.
+     *
      * @return bool
      */
     public function canView(DatabaseObject $object);
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php
index d6e4b523d33..82848e388ac 100644
--- a/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php
@@ -18,7 +18,7 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @extends AbstractSitemapObjectObjectType<PageContent, PageContentList>
+ * @extends AbstractSitemapObjectObjectType<PageContentList>
  */
 class MultilingualPageSitemapObject extends AbstractSitemapObjectObjectType
 {
@@ -51,6 +51,8 @@ public function getObjectList()
     #[\Override]
     public function canView(DatabaseObject $object)
     {
+        \assert($object instanceof PageContent);
+
         $page = new Page($object->pageID);
 
         if ($page->requireObjectID !== 0) {
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
new file mode 100644
index 00000000000..333be22fbe2
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace wcf\system\sitemap\object;
+
+use wcf\data\DatabaseObject;
+use wcf\data\DatabaseObjectList;
+use wcf\data\object\type\ObjectType;
+use wcf\data\package\PackageCache;
+use wcf\system\WCF;
+
+/**
+ * Represents a sitemap object that is registered with the
+ * `wcf\event\sitemap\SitemapObjectCollecting` event.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class RegisteredSitemapObject
+{
+    public const DEFAULT_PRIORITY = 0.5;
+
+    public const DEFAULT_CHANGE_FREQ = 'monthly';
+
+    public const DEFAULT_REBUILD_TIME = 604800;
+
+    /**
+     * @param $objectName Unique name of the sitemap object, e.g. `com.example.foo.sitemap.object.bar`.
+     * @param ISitemapObjectObjectType<DatabaseObjectList<DatabaseObject>> $processor
+     * @param $packageID Package that owns the generated sitemap files, defaults to the core.
+     */
+    public function __construct(
+        private readonly string $objectName,
+        private readonly ISitemapObjectObjectType $processor,
+        private readonly float $priority = self::DEFAULT_PRIORITY,
+        private readonly string $changeFreq = self::DEFAULT_CHANGE_FREQ,
+        private readonly int $rebuildTime = self::DEFAULT_REBUILD_TIME,
+        private readonly ?int $packageID = null,
+        private readonly bool $isDisabled = false,
+    ) {}
+
+    /**
+     * Creates a sitemap object from a legacy object type of the deprecated
+     * object type definition `com.woltlab.wcf.sitemap.object`.
+     */
+    public static function fromObjectType(ObjectType $objectType): self
+    {
+        $processor = $objectType->getProcessor();
+        \assert($processor instanceof ISitemapObjectObjectType);
+
+        return new self(
+            $objectType->objectType,
+            $processor,
+            $objectType->priority !== null ? (float)$objectType->priority : self::DEFAULT_PRIORITY,
+            $objectType->changeFreq ?? self::DEFAULT_CHANGE_FREQ,
+            $objectType->rebuildTime !== null ? (int)$objectType->rebuildTime : self::DEFAULT_REBUILD_TIME,
+            $objectType->packageID,
+            (bool)$objectType->isDisabled,
+        );
+    }
+
+    public function getObjectName(): string
+    {
+        return $this->objectName;
+    }
+
+    /**
+     * Returns the localized name of this sitemap object.
+     */
+    public function getName(): string
+    {
+        return WCF::getLanguage()->getDynamicVariable(
+            \sprintf('wcf.acp.sitemap.objectType.%s', $this->objectName)
+        );
+    }
+
+    /**
+     * @return ISitemapObjectObjectType<DatabaseObjectList<DatabaseObject>>
+     */
+    public function getProcessor(): ISitemapObjectObjectType
+    {
+        return $this->processor;
+    }
+
+    public function getPriority(): float
+    {
+        return $this->priority;
+    }
+
+    /**
+     * Returns the change frequency configured by the developer. The value that is
+     * actually used may be overwritten by the administrator, see
+     * `wcf\system\sitemap\SitemapHandler::getChangeFreq()`.
+     */
+    public function getChangeFreq(): string
+    {
+        return $this->changeFreq;
+    }
+
+    /**
+     * Returns the rebuild time configured by the developer. The value that is
+     * actually used may be overwritten by the administrator, see
+     * `wcf\system\sitemap\SitemapHandler::getRebuildTime()`.
+     */
+    public function getRebuildTime(): int
+    {
+        return $this->rebuildTime;
+    }
+
+    /**
+     * Returns the default state configured by the developer. The state that is
+     * actually used may be overwritten by the administrator, see
+     * `wcf\system\sitemap\SitemapHandler::isDisabled()`.
+     */
+    public function isDisabled(): bool
+    {
+        return $this->isDisabled;
+    }
+
+    public function getPackageID(): int
+    {
+        return $this->packageID ?? PackageCache::getInstance()->getPackageID('com.woltlab.wcf');
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/SimplePageSitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/SimplePageSitemapObject.class.php
index 1e2a02fc6db..f4dfebfc36f 100644
--- a/wcfsetup/install/files/lib/system/sitemap/object/SimplePageSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/SimplePageSitemapObject.class.php
@@ -16,7 +16,7 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @extends AbstractSitemapObjectObjectType<Page, PageList>
+ * @extends AbstractSitemapObjectObjectType<PageList>
  */
 class SimplePageSitemapObject extends AbstractSitemapObjectObjectType
 {
@@ -39,6 +39,8 @@ public function getObjectList()
     #[\Override]
     public function canView(DatabaseObject $object)
     {
+        \assert($object instanceof Page);
+
         if ($object->requireObjectID !== 0) {
             return false;
         }
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/UserSitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/UserSitemapObject.class.php
index 411236bb6e6..dbda0dec4e1 100755
--- a/wcfsetup/install/files/lib/system/sitemap/object/UserSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/UserSitemapObject.class.php
@@ -14,7 +14,7 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @extends AbstractSitemapObjectObjectType<User, UserList>
+ * @extends AbstractSitemapObjectObjectType<UserList>
  */
 class UserSitemapObject extends AbstractSitemapObjectObjectType
 {
diff --git a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
index 18d8e62e4f1..1f21fd9d1ed 100755
--- a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
@@ -6,16 +6,14 @@
 use wcf\data\DatabaseObject;
 use wcf\data\DatabaseObjectList;
 use wcf\data\ILinkableObject;
-use wcf\data\object\type\ObjectType;
-use wcf\data\object\type\ObjectTypeCache;
 use wcf\data\user\User;
 use wcf\system\exception\ImplementationException;
-use wcf\system\exception\ParentClassException;
 use wcf\system\io\AtomicWriter;
 use wcf\system\io\File;
 use wcf\system\Regex;
-use wcf\system\registry\RegistryHandler;
 use wcf\system\request\LinkHandler;
+use wcf\system\sitemap\object\RegisteredSitemapObject;
+use wcf\system\sitemap\SitemapHandler;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\MessageUtil;
@@ -39,8 +37,9 @@ class SitemapRebuildWorker extends AbstractRebuildDataWorker
     /**
      * Prefix for stored data in the registry.
      * @since 5.3
+     * @deprecated 6.3 use `wcf\system\sitemap\SitemapHandler::REGISTRY_PREFIX` instead
      */
-    const REGISTRY_PREFIX = 'sitemapData_';
+    const REGISTRY_PREFIX = SitemapHandler::REGISTRY_PREFIX;
 
     /**
      * @inheritDoc
@@ -48,8 +47,8 @@ class SitemapRebuildWorker extends AbstractRebuildDataWorker
     public $limit = 250;
 
     /**
-     * All object types for the site maps.
-     * @var ObjectType[]
+     * All objects for the site maps.
+     * @var RegisteredSitemapObject[]
      */
     public $sitemapObjects = [];
 
@@ -71,11 +70,6 @@ class SitemapRebuildWorker extends AbstractRebuildDataWorker
      */
     private $actualUser;
 
-    /**
-     * @var mixed[]
-     */
-    private $sitemapData = [];
-
     #[\Override]
     public function initObjectList()
     {
@@ -96,23 +90,18 @@ public function countObjects()
                 $this->count = 0;
 
                 // read sitemaps
-                $sitemapObjects = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.sitemap.object');
+                $sitemapObjects = SitemapHandler::getInstance()->getObjects();
                 foreach ($sitemapObjects as $sitemapObject) {
-                    $this->prepareSitemapObject($sitemapObject);
                     $processor = $sitemapObject->getProcessor();
 
                     if (
                         $processor->isAvailableType()
-                        && $this->sitemapData[$sitemapObject->objectType]['isDisabled'] === 0
+                        && !SitemapHandler::getInstance()->isDisabled($sitemapObject)
                     ) {
                         $this->sitemapObjects[] = $sitemapObject;
 
                         $list = $processor->getObjectList();
 
-                        if (!($list instanceof DatabaseObjectList)) {
-                            throw new ParentClassException(\get_class($list), DatabaseObjectList::class);
-                        }
-
                         if (\SITEMAP_INDEX_TIME_FRAME > 0 && $processor->getLastModifiedColumn() !== null) {
                             $list->getConditionBuilder()->add($processor->getLastModifiedColumn() . " > ?", [
                                 \TIME_NOW - \SITEMAP_INDEX_TIME_FRAME * 86400, // one day (60 * 60 * 24)
@@ -127,7 +116,7 @@ public function countObjects()
                         }
                         $this->count += $iterations * $this->limit;
                     } else {
-                        $this->deleteSitemaps($sitemapObject->objectType);
+                        $this->deleteSitemaps($sitemapObject->getObjectName());
                     }
                 }
             }
@@ -180,7 +169,7 @@ public function execute()
 
             // delete all previously created sitemap files so that no more relics remain in the system
             if ($sitemapLoopCount === 0) {
-                $this->deleteSitemaps($this->sitemapObjects[$this->workerData['sitemap']]->objectType);
+                $this->deleteSitemaps($this->sitemapObjects[$this->workerData['sitemap']]->getObjectName());
             }
 
             /** @var DatabaseObjectList<DatabaseObject> $objectList */
@@ -207,14 +196,14 @@ public function execute()
                     $object->{$sitemapObject->getLastModifiedColumn()}
                 );
 
-                $objectType = $this->sitemapObjects[$this->workerData['sitemap']];
+                $registeredObject = $this->sitemapObjects[$this->workerData['sitemap']];
                 if ($sitemapObject->canView($object)) {
                     $this->file->write(WCF::getTPL()->render('wcf', 'shared_sitemapEntry', [
                         // strip session links
                         'link' => MessageUtil::stripCrap($link),
                         'lastModifiedTime' => $lastModifiedTime,
-                        'priority' => $objectType->priority,
-                        'changeFreq' => $this->sitemapData[$objectType->objectType]['changeFreq'],
+                        'priority' => $registeredObject->getPriority(),
+                        'changeFreq' => SitemapHandler::getInstance()->getChangeFreq($registeredObject),
                     ]));
 
                     $this->workerData['dataCount']++;
@@ -222,9 +211,9 @@ public function execute()
             }
 
             if ($this->workerData['dataCount'] + $this->limit > self::SITEMAP_OBJECT_LIMIT) {
-                $packageID = $this->sitemapObjects[$this->workerData['sitemap']]->packageID;
-                $objectTypeName = $this->sitemapObjects[$this->workerData['sitemap']]->objectType;
-                $filename = $objectTypeName . '_' . $this->workerData['sitemapLoopCount'] . '.xml';
+                $packageID = $this->sitemapObjects[$this->workerData['sitemap']]->getPackageID();
+                $objectName = $this->sitemapObjects[$this->workerData['sitemap']]->getObjectName();
+                $filename = $objectName . '_' . $this->workerData['sitemapLoopCount'] . '.xml';
                 $this->finishSitemap($filename, $packageID);
 
                 $this->generateTmpFile(false);
@@ -236,8 +225,8 @@ public function execute()
             // finish sitemap
             if (\count($objectList) < $this->limit) {
                 if ($this->workerData['dataCount'] > 0) {
-                    $packageID = $this->sitemapObjects[$this->workerData['sitemap']]->packageID;
-                    $filename = $this->sitemapObjects[$this->workerData['sitemap']]->objectType . '.xml';
+                    $packageID = $this->sitemapObjects[$this->workerData['sitemap']]->getPackageID();
+                    $filename = $this->sitemapObjects[$this->workerData['sitemap']]->getObjectName() . '.xml';
                     $this->finishSitemap($filename, $packageID);
                     $this->generateTmpFile(false);
                 }
@@ -274,12 +263,12 @@ protected function checkCache()
         $object = (isset($this->sitemapObjects[$this->workerData['sitemap']])) ? $this->sitemapObjects[$this->workerData['sitemap']] : false;
         while (
             $object
-            && \file_exists(self::getSitemapPath() . $object->objectType . '.xml')
-            && \filectime(self::getSitemapPath() . $object->objectType . '.xml') > \TIME_NOW - ($this->sitemapData[$object->objectType]['rebuildTime'] ?: 60 * 60 * 24 * 7)
+            && \file_exists(self::getSitemapPath() . $object->getObjectName() . '.xml')
+            && \filectime(self::getSitemapPath() . $object->getObjectName() . '.xml') > \TIME_NOW - (SitemapHandler::getInstance()->getRebuildTime($object) ?: 60 * 60 * 24 * 7)
         ) {
             $filenames = \array_merge(
-                \glob(self::getSitemapPath() . $object->objectType . '_*'),
-                [self::getSitemapPath() . $object->objectType . '.xml']
+                \glob(self::getSitemapPath() . $object->getObjectName() . '_*'),
+                [self::getSitemapPath() . $object->getObjectName() . '.xml']
             );
             foreach ($filenames as $filename) {
                 $this->workerData['sitemaps'][] = self::getSitemapURL() . \basename($filename);
@@ -486,13 +475,13 @@ public static function getSitemapURL()
     }
 
     /**
-     * Unlink the sitemap files for a given object type name.
+     * Unlink the sitemap files for a given sitemap object name.
      */
-    private function deleteSitemaps(string $objectTypeName): void
+    private function deleteSitemaps(string $objectName): void
     {
-        $files = @\glob(self::getSitemapPath() . $objectTypeName . '*.xml');
+        $files = @\glob(self::getSitemapPath() . $objectName . '*.xml');
         if (\is_array($files)) {
-            $regex = new Regex(\preg_quote($objectTypeName) . '(_[0-9]*|).xml');
+            $regex = new Regex(\preg_quote($objectName) . '(_[0-9]*|).xml');
             foreach ($files as $filename) {
                 if ($regex->match(\basename($filename)) !== 0) {
                     \unlink($filename);
@@ -519,33 +508,4 @@ private function changeToActualUser(): void
     {
         WCF::getSession()->changeUser($this->actualUser, true);
     }
-
-    /**
-     * Reads the columns changed by the user for this sitemap object from the registry.
-     *
-     * @since       5.3
-     */
-    private function prepareSitemapObject(ObjectType $object): void
-    {
-        $this->sitemapData[$object->objectType] = [
-            'changeFreq' => $object->changeFreq,
-            'rebuildTime' => $object->rebuildTime,
-            'isDisabled' => 0,
-        ];
-
-        $sitemapData = RegistryHandler::getInstance()->get(
-            'com.woltlab.wcf',
-            self::REGISTRY_PREFIX . $object->objectType
-        );
-
-        if ($sitemapData !== null) {
-            $sitemapData = @\unserialize($sitemapData);
-
-            if (\is_array($sitemapData)) {
-                $this->sitemapData[$object->objectType]['changeFreq'] = $sitemapData['changeFreq'];
-                $this->sitemapData[$object->objectType]['rebuildTime'] = $sitemapData['rebuildTime'];
-                $this->sitemapData[$object->objectType]['isDisabled'] = $sitemapData['isDisabled'];
-            }
-        }
-    }
 }

From 9ef0dbd2c765a3aa8e633d032fc755860b8cb79b Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 8 Sep 2026 20:36:34 +0200
Subject: [PATCH 02/10] Convert the sitemap object list into a grid view

---
 .../files/acp/templates/sitemapList.tpl       |  60 +----
 .../lib/acp/page/SitemapListPage.class.php    |  60 +----
 .../SitemapGridViewInitialized.class.php      |  21 ++
 .../gridView/admin/SitemapGridView.class.php  | 214 ++++++++++++++++++
 .../object/RegisteredSitemapObject.class.php  |   7 +
 5 files changed, 252 insertions(+), 110 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/event/gridView/admin/SitemapGridViewInitialized.class.php
 create mode 100644 wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php

diff --git a/wcfsetup/install/files/acp/templates/sitemapList.tpl b/wcfsetup/install/files/acp/templates/sitemapList.tpl
index bcfb86b6ec5..0ce5176bd06 100644
--- a/wcfsetup/install/files/acp/templates/sitemapList.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapList.tpl
@@ -18,63 +18,9 @@
 
 <woltlab-core-notice type="info">{lang}wcf.acp.sitemap.cliInfo{/lang}</woltlab-core-notice>
 
-{if $sitemapObjects|count}
-	<div class="section tabularBox">
-		<table id="sitemapObjectList" class="table">
-			<thead>
-				<tr>
-					<th class="columnTitle columnSitemap" colspan="2">{lang}wcf.acp.sitemap{/lang}</th>
-					<th class="columnInteger columnPriority">{lang}wcf.acp.sitemap.priority{/lang}</th>
-					<th class="columnText columnChangeFreq">{lang}wcf.acp.sitemap.changeFreq{/lang}</th>
-					<th class="columnInteger columnRebuildTime">{lang}wcf.acp.sitemap.rebuildTime{/lang}</th>
-					
-					{event name='headColumns'}
-				</tr>
-			</thead>
-			
-			<tbody>
-				{foreach from=$sitemapObjects key=objectName item=object}
-					<tr class="sitemapObjectRow">
-						<td class="columnIcon">
-							<woltlab-core-toggle-button
-								data-interaction="sitemapObjectToggle"
-								aria-label="{lang}wcf.global.button.enable{/lang}"
-								data-enable-endpoint="{$sitemapData[$objectName]['enableEndpoint']}"
-								data-disable-endpoint="{$sitemapData[$objectName]['disableEndpoint']}"
-								{if !$sitemapData[$objectName]['isDisabled']}checked{/if}
-							></woltlab-core-toggle-button>
-							<a href="{link controller="SitemapEdit"}objectType={$objectName}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon name='pencil'}</a>
-						</td>
-						<td class="columnTitle columnSitemap"><a href="{link controller="SitemapEdit"}objectType={$objectName}{/link}">{$object->getName()}</a></td>
-						<td class="columnInteger columnPriority">{$object->getPriority()}</td>
-						<td class="columnText columnChangeFreq">{lang}wcf.acp.sitemap.changeFreq.{$sitemapData[$objectName]['changeFreq']}{/lang}</td>
-						<td class="columnInteger columnRebuildTime">{dateInterval end=TIME_NOW+$sitemapData[$objectName]['rebuildTime'] full=true format='plain'}</td>
-						
-						{event name='columns'}
-					</tr>
-				{/foreach}
-			</tbody>
-		</table>
-	</div>
-	
-	<footer class="contentFooter">
-		{hascontent}
-			<nav class="contentFooterNavigation">
-				<ul>
-					{content}{event name='contentFooterNavigation'}{/content}
-				</ul>
-			</nav>
-		{/hascontent}
-	</footer>
-	
-	<script data-relocate="true">
-		require(['WoltLabSuite/Core/Component/Interaction/Toggle'], ({ setup }) => {
-			setup('sitemapObjectToggle', document.getElementById('sitemapObjectList'));
-		});
-	</script>
-{else}
-	<woltlab-core-notice type="info">{lang}wcf.global.noItems{/lang}</woltlab-core-notice>
-{/if}
+<div class="section">
+	{unsafe:$gridView->render()}
+</div>
 
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Acp/Ui/Worker'], function (AcpUiWorker) {
diff --git a/wcfsetup/install/files/lib/acp/page/SitemapListPage.class.php b/wcfsetup/install/files/lib/acp/page/SitemapListPage.class.php
index 7de3a7a45ba..0cd3c3f397e 100755
--- a/wcfsetup/install/files/lib/acp/page/SitemapListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/SitemapListPage.class.php
@@ -2,12 +2,8 @@
 
 namespace wcf\acp\page;
 
-use wcf\action\ApiAction;
-use wcf\page\AbstractPage;
-use wcf\system\request\LinkHandler;
-use wcf\system\sitemap\object\RegisteredSitemapObject;
-use wcf\system\sitemap\SitemapHandler;
-use wcf\system\WCF;
+use wcf\page\AbstractGridViewPage;
+use wcf\system\gridView\admin\SitemapGridView;
 
 /**
  * Shows a list of sitemap objects.
@@ -15,8 +11,10 @@
  * @author  Joshua Ruesweg
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ *
+ * @extends AbstractGridViewPage<SitemapGridView>
  */
-class SitemapListPage extends AbstractPage
+class SitemapListPage extends AbstractGridViewPage
 {
     /**
      * @inheritDoc
@@ -28,53 +26,9 @@ class SitemapListPage extends AbstractPage
      */
     public $neededPermissions = ['admin.management.canRebuildData'];
 
-    /**
-     * @var array<string, RegisteredSitemapObject>
-     * @since 6.3
-     */
-    public $sitemapObjects = [];
-
-    /**
-     * @var mixed[]
-     */
-    private $sitemapData = [];
-
     #[\Override]
-    public function readData()
+    protected function createGridView(): SitemapGridView
     {
-        parent::readData();
-
-        $this->sitemapObjects = SitemapHandler::getInstance()->getObjects();
-
-        $apiUrl = LinkHandler::getInstance()->getControllerLink(ApiAction::class, ['id' => 'rpc']);
-
-        foreach ($this->sitemapObjects as $sitemapObject) {
-            $this->sitemapData[$sitemapObject->getObjectName()] = [
-                'changeFreq' => SitemapHandler::getInstance()->getChangeFreq($sitemapObject),
-                'rebuildTime' => SitemapHandler::getInstance()->getRebuildTime($sitemapObject),
-                'isDisabled' => SitemapHandler::getInstance()->isDisabled($sitemapObject),
-                'enableEndpoint' => \sprintf(
-                    '%score/sitemaps/%s/enable',
-                    $apiUrl,
-                    \rawurlencode($sitemapObject->getObjectName())
-                ),
-                'disableEndpoint' => \sprintf(
-                    '%score/sitemaps/%s/disable',
-                    $apiUrl,
-                    \rawurlencode($sitemapObject->getObjectName())
-                ),
-            ];
-        }
-    }
-
-    #[\Override]
-    public function assignVariables()
-    {
-        parent::assignVariables();
-
-        WCF::getTPL()->assign([
-            'sitemapObjects' => $this->sitemapObjects,
-            'sitemapData' => $this->sitemapData,
-        ]);
+        return new SitemapGridView();
     }
 }
diff --git a/wcfsetup/install/files/lib/event/gridView/admin/SitemapGridViewInitialized.class.php b/wcfsetup/install/files/lib/event/gridView/admin/SitemapGridViewInitialized.class.php
new file mode 100644
index 00000000000..04ff7abd9d9
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/gridView/admin/SitemapGridViewInitialized.class.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace wcf\event\gridView\admin;
+
+use wcf\event\IPsr14Event;
+use wcf\system\gridView\admin\SitemapGridView;
+
+/**
+ * Indicates that the sitemap grid view has been initialized.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class SitemapGridViewInitialized implements IPsr14Event
+{
+    public function __construct(
+        public readonly SitemapGridView $gridView
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php b/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php
new file mode 100644
index 00000000000..82e3626f996
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php
@@ -0,0 +1,214 @@
+<?php
+
+namespace wcf\system\gridView\admin;
+
+use wcf\acp\form\SitemapEditForm;
+use wcf\data\DatabaseObject;
+use wcf\data\DatabaseObjectList;
+use wcf\data\ILinkableObject;
+use wcf\event\gridView\admin\SitemapGridViewInitialized;
+use wcf\system\gridView\AbstractGridView;
+use wcf\system\gridView\GridViewColumn;
+use wcf\system\gridView\GridViewRowLink;
+use wcf\system\gridView\renderer\DefaultColumnRenderer;
+use wcf\system\gridView\renderer\NumberColumnRenderer;
+use wcf\system\interaction\ToggleInteraction;
+use wcf\system\request\LinkHandler;
+use wcf\system\sitemap\object\RegisteredSitemapObject;
+use wcf\system\sitemap\SitemapHandler;
+use wcf\system\WCF;
+use wcf\util\DateUtil;
+
+/**
+ * Grid view for the list of sitemap objects.
+ *
+ * The rows of this grid view are not backed by a database table, they are
+ * created from the sitemap objects provided by `SitemapHandler`.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends AbstractGridView<DatabaseObject, DatabaseObjectList>
+ */
+final class SitemapGridView extends AbstractGridView
+{
+    public function __construct()
+    {
+        $this->addColumns([
+            GridViewColumn::for('name')
+                ->label('wcf.acp.sitemap')
+                ->titleColumn()
+                ->sortable(),
+            GridViewColumn::for('priority')
+                ->label('wcf.acp.sitemap.priority')
+                ->renderer(new NumberColumnRenderer()),
+            GridViewColumn::for('changeFreq')
+                ->label('wcf.acp.sitemap.changeFreq')
+                ->renderer(new class extends DefaultColumnRenderer {
+                    #[\Override]
+                    public function render(mixed $value, DatabaseObject $row): string
+                    {
+                        return WCF::getLanguage()->get('wcf.acp.sitemap.changeFreq.' . (string)$value);
+                    }
+                }),
+            GridViewColumn::for('rebuildTime')
+                ->label('wcf.acp.sitemap.rebuildTime')
+                ->renderer(new class extends DefaultColumnRenderer {
+                    #[\Override]
+                    public function render(mixed $value, DatabaseObject $row): string
+                    {
+                        $start = DateUtil::getDateTimeByTimestamp(\TIME_NOW);
+                        $end = DateUtil::getDateTimeByTimestamp(\TIME_NOW + (int)$value);
+
+                        return DateUtil::formatInterval($end->diff($start), true, DateUtil::FORMAT_PLAIN);
+                    }
+                }),
+        ]);
+
+        $this->addQuickInteraction(new ToggleInteraction(
+            'sitemapObjectToggle',
+            'core/sitemaps/%s/enable',
+            'core/sitemaps/%s/disable',
+        ));
+        $this->addRowLink(new GridViewRowLink(isLinkableObject: true));
+        $this->setDefaultSortField('name');
+        $this->setRowsPerPage(50);
+    }
+
+    #[\Override]
+    public function isAccessible(): bool
+    {
+        return WCF::getSession()->hasPermission('admin.management.canRebuildData');
+    }
+
+    #[\Override]
+    public function getRows(): array
+    {
+        if (!isset($this->objects)) {
+            $this->getObjectList();
+        }
+
+        return $this->objects;
+    }
+
+    #[\Override]
+    public function countRows(): int
+    {
+        if (!isset($this->objectCount)) {
+            $this->getObjectList();
+        }
+
+        return $this->objectCount;
+    }
+
+    #[\Override]
+    protected function initObjectList(): void
+    {
+        $this->objectList = $this->createObjectList();
+        $this->fireInitializedEvent();
+        $this->validate();
+
+        $objects = $this->loadDataSource();
+
+        $objectIDFilter = $this->getObjectIDFilter();
+        if ($objectIDFilter !== null) {
+            $objects = \array_filter(
+                $objects,
+                static fn (string $objectName) => $objectName === (string)$objectIDFilter,
+                \ARRAY_FILTER_USE_KEY
+            );
+        }
+
+        $this->objectCount = \count($objects);
+
+        if ($this->getPageNo() > 1 && $this->getPageNo() > $this->countPages()) {
+            $this->setPageNo($this->countPages() ?: 1);
+        }
+
+        \uasort($objects, $this->getComparator());
+
+        $this->objects = \array_slice(
+            $objects,
+            ($this->getPageNo() - 1) * $this->getRowsPerPage(),
+            $this->getRowsPerPage()
+        );
+    }
+
+    #[\Override]
+    protected function applyFilters(): void
+    {
+        // This grid view is not backed by a database table, filters would have
+        // to be applied in `loadDataSource()`.
+    }
+
+    #[\Override]
+    protected function getInitializedEvent(): SitemapGridViewInitialized
+    {
+        return new SitemapGridViewInitialized($this);
+    }
+
+    /**
+     * @return DatabaseObjectList<DatabaseObject>
+     */
+    #[\Override]
+    protected function createObjectList(): DatabaseObjectList
+    {
+        return new class extends DatabaseObjectList {};
+    }
+
+    /**
+     * @return array<string, DatabaseObject>
+     */
+    private function loadDataSource(): array
+    {
+        $rows = [];
+        foreach (SitemapHandler::getInstance()->getObjects() as $objectName => $object) {
+            $rows[$objectName] = $this->createRow($object);
+        }
+
+        return $rows;
+    }
+
+    private function createRow(RegisteredSitemapObject $object): DatabaseObject
+    {
+        $handler = SitemapHandler::getInstance();
+
+        return new class(null, [
+            'objectName' => $object->getObjectName(),
+            'name' => $object->getName(),
+            'priority' => $object->getPriority(),
+            'changeFreq' => $handler->getChangeFreq($object),
+            'rebuildTime' => $handler->getRebuildTime($object),
+            'isDisabled' => $handler->isDisabled($object) ? 1 : 0,
+        ]) extends DatabaseObject implements ILinkableObject {
+            protected static $databaseTableIndexName = 'objectName';
+
+            #[\Override]
+            public function getLink(): string
+            {
+                return LinkHandler::getInstance()->getControllerLink(SitemapEditForm::class, [
+                    'objectType' => (string)$this->__get('objectName'),
+                ]);
+            }
+        };
+    }
+
+    private function getComparator(): \Closure
+    {
+        $sortField = $this->getSortField() !== '' ? $this->getSortField() : $this->getDefaultSortField();
+        $sortOrder = $this->getSortOrder();
+        $collator = new \Collator(WCF::getLanguage()->getLocale());
+
+        return static function (DatabaseObject $a, DatabaseObject $b) use ($sortField, $sortOrder, $collator): int {
+            $result = (int)$collator->compare((string)$a->__get($sortField), (string)$b->__get($sortField));
+            if ($result === 0) {
+                // The order must be stable because the rows are paginated.
+                $result = \strcmp((string)$a->__get('objectName'), (string)$b->__get('objectName'));
+            }
+
+            return $sortOrder === 'ASC' ? $result : -$result;
+        };
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
index 333be22fbe2..b686fe98762 100644
--- a/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
@@ -29,6 +29,8 @@ final class RegisteredSitemapObject
      * @param $objectName Unique name of the sitemap object, e.g. `com.example.foo.sitemap.object.bar`.
      * @param ISitemapObjectObjectType<DatabaseObjectList<DatabaseObject>> $processor
      * @param $packageID Package that owns the generated sitemap files, defaults to the core.
+     * @param $name Localized name of the sitemap object, defaults to the phrase
+     *              `wcf.acp.sitemap.objectType.{objectName}`.
      */
     public function __construct(
         private readonly string $objectName,
@@ -38,6 +40,7 @@ public function __construct(
         private readonly int $rebuildTime = self::DEFAULT_REBUILD_TIME,
         private readonly ?int $packageID = null,
         private readonly bool $isDisabled = false,
+        private readonly string $name = '',
     ) {}
 
     /**
@@ -70,6 +73,10 @@ public function getObjectName(): string
      */
     public function getName(): string
     {
+        if ($this->name !== '') {
+            return $this->name;
+        }
+
         return WCF::getLanguage()->getDynamicVariable(
             \sprintf('wcf.acp.sitemap.objectType.%s', $this->objectName)
         );

From 0889766d783639944e08b8d700bf1c93a3126ac4 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 9 Sep 2026 11:07:39 +0200
Subject: [PATCH 03/10] Remove obsolete notice about CLI

---
 wcfsetup/install/files/acp/templates/sitemapList.tpl | 2 --
 wcfsetup/install/lang/de.xml                         | 2 +-
 wcfsetup/install/lang/en.xml                         | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/sitemapList.tpl b/wcfsetup/install/files/acp/templates/sitemapList.tpl
index 0ce5176bd06..ce9cf28465e 100644
--- a/wcfsetup/install/files/acp/templates/sitemapList.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapList.tpl
@@ -16,8 +16,6 @@
 
 <woltlab-core-notice type="info">{lang}wcf.acp.sitemap.submitToSearchEngines{/lang}</woltlab-core-notice>
 
-<woltlab-core-notice type="info">{lang}wcf.acp.sitemap.cliInfo{/lang}</woltlab-core-notice>
-
 <div class="section">
 	{unsafe:$gridView->render()}
 </div>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 321fbe32502..460840bb16e 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2731,7 +2731,6 @@ Abschnitte dürfen nicht leer sein und nur folgende Zeichen enthalten: <kbd>[a-z
 		<item name="wcf.acp.sitemap.rebuildTime.description"><![CDATA[Die Zeit nachdem die Sitemap erneuert werden soll.]]></item>
 		<item name="wcf.acp.sitemap.isDisabled"><![CDATA[Sitemap deaktivieren]]></item>
 		<item name="wcf.acp.sitemap.edit"><![CDATA[Sitemap bearbeiten]]></item>
-		<item name="wcf.acp.sitemap.cliInfo"><![CDATA[Die Sitemap kann auch mittels CLI neu generiert werden. {if LANGUAGE_USE_INFORMAL_VARIANT}Führe{else}Führen Sie{/if} dafür <kbd>worker wcf\\system\\worker\\SitemapRebuildWorker</kbd> in einer CLI Session aus.]]></item>
 		<item name="wcf.acp.sitemap.submitToSearchEngines"><![CDATA[<p>Die generierte Sitemap muss einmalig bei den gewünschten Suchmaschinen manuell hinterlegt werden, die vollständige Adresse lautet: <kbd>{$__wcf->getPath()}sitemaps/sitemap.xml</kbd>.</p>
 <p><br></p>
 <p>Anleitung zum Hinterlegen der XML-Sitemaps:</p>
@@ -5730,5 +5729,6 @@ Erlaubte Dateiendungen: {', '|implode:$allowedFileExtensions}]]></item>
 	<item name="wcf.acp.devtools.missingLanguageItem.stackTrace.toggleOutputFormat"/>
 	<item name="wcf.acp.article.setCategory"/>
 	<item name="wcf.acp.trophy.userTrophy.delete.confirmMessage"/>
+	<item name="wcf.acp.sitemap.cliInfo"/>
 </delete>
 </language>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 5ca02385fcd..e193687f837 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2660,7 +2660,6 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 		<item name="wcf.acp.sitemap.rebuildTime.description"><![CDATA[Time interval after which the sitemap has to be rebuilt.]]></item>
 		<item name="wcf.acp.sitemap.isDisabled"><![CDATA[Disable Sitemap]]></item>
 		<item name="wcf.acp.sitemap.edit"><![CDATA[Edit Sitemap]]></item>
-		<item name="wcf.acp.sitemap.cliInfo"><![CDATA[You can rebuild the sitemap using CLI. For that, execute <kbd>worker wcf\\system\\worker\\SitemapRebuildWorker</kbd> in a CLI session.]]></item>
 		<item name="wcf.acp.sitemap.submitToSearchEngines"><![CDATA[<p>The generated sitemap needs to be submitted once to the search engines, please provide this link: <kbd>{$__wcf->getPath()}sitemaps/sitemap.xml</kbd>.</p>
 <p><br></p>
 <p>Instructions for submitting the sitemap:</p>
@@ -5732,5 +5731,6 @@ Allowed extensions: {', '|implode:$allowedFileExtensions}]]></item>
 	<item name="wcf.acp.devtools.missingLanguageItem.stackTrace.toggleOutputFormat"/>
 	<item name="wcf.acp.article.setCategory"/>
 	<item name="wcf.acp.trophy.userTrophy.delete.confirmMessage"/>
+	<item name="wcf.acp.sitemap.cliInfo"/>
 </delete>
 </language>

From cc7714d2a365477ef3fede3be4c3e8c394235e2d Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 9 Sep 2026 11:10:26 +0200
Subject: [PATCH 04/10] Simplify sitemap submission notice

---
 wcfsetup/install/lang/de.xml | 7 +------
 wcfsetup/install/lang/en.xml | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 460840bb16e..a986ba2b3b2 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2732,12 +2732,7 @@ Abschnitte dürfen nicht leer sein und nur folgende Zeichen enthalten: <kbd>[a-z
 		<item name="wcf.acp.sitemap.isDisabled"><![CDATA[Sitemap deaktivieren]]></item>
 		<item name="wcf.acp.sitemap.edit"><![CDATA[Sitemap bearbeiten]]></item>
 		<item name="wcf.acp.sitemap.submitToSearchEngines"><![CDATA[<p>Die generierte Sitemap muss einmalig bei den gewünschten Suchmaschinen manuell hinterlegt werden, die vollständige Adresse lautet: <kbd>{$__wcf->getPath()}sitemaps/sitemap.xml</kbd>.</p>
-<p><br></p>
-<p>Anleitung zum Hinterlegen der XML-Sitemaps:</p>
-<ul class="nativeList">
-	<li><a href="https://support.google.com/webmasters/answer/7451001" class="externalURL">Google</a></li>
-	<li><a href="https://www.bing.com/webmasters/help/sitemaps-3b5cf6ed" class="externalURL">Bing</a></li>
-</ul>]]></item>
+<p>Anleitung zum Hinterlegen der XML-Sitemaps: <a href="https://support.google.com/webmasters/answer/7451001" class="externalURL">Google</a>, <a href="https://www.bing.com/webmasters/help/sitemaps-3b5cf6ed" class="externalURL">Bing</a></p>]]></item>
 		<item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.user"><![CDATA[Benutzer]]></item>
 		<item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.articleCategory"><![CDATA[Artikel-Kategorien]]></item>
 		<item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.article"><![CDATA[Artikel]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index e193687f837..0885d1aed60 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2661,12 +2661,7 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 		<item name="wcf.acp.sitemap.isDisabled"><![CDATA[Disable Sitemap]]></item>
 		<item name="wcf.acp.sitemap.edit"><![CDATA[Edit Sitemap]]></item>
 		<item name="wcf.acp.sitemap.submitToSearchEngines"><![CDATA[<p>The generated sitemap needs to be submitted once to the search engines, please provide this link: <kbd>{$__wcf->getPath()}sitemaps/sitemap.xml</kbd>.</p>
-<p><br></p>
-<p>Instructions for submitting the sitemap:</p>
-<ul class="nativeList">
-	<li><a href="https://support.google.com/webmasters/answer/7451001" class="externalURL">Google</a></li>
-	<li><a href="https://www.bing.com/webmasters/help/sitemaps-3b5cf6ed" class="externalURL">Bing</a></li>
-</ul>]]></item>
+<p>Instructions for submitting the sitemap: <a href="https://support.google.com/webmasters/answer/7451001" class="externalURL">Google</a>, <a href="https://www.bing.com/webmasters/help/sitemaps-3b5cf6ed" class="externalURL">Bing</a></p>]]></item>
 		<item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.user"><![CDATA[Users]]></item>
 		<item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.articleCategory"><![CDATA[Article categories]]></item>
 		<item name="wcf.acp.sitemap.objectType.com.woltlab.wcf.sitemap.object.article"><![CDATA[Articles]]></item>

From d787e9e890a40116eeef07cf9952a44d8aaaad4a Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 9 Sep 2026 11:11:29 +0200
Subject: [PATCH 05/10] Remove obsolete link back to the list page

---
 .../install/files/acp/templates/sitemapEdit.tpl  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/sitemapEdit.tpl b/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
index 4bcdd8ad849..190b46aff7c 100755
--- a/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
@@ -6,13 +6,15 @@
 		<p class="contentHeaderDescription">{$sitemapObject->getName()}</p>
 	</div>
 	
-	<nav class="contentHeaderNavigation">
-		<ul>
-			<li><a href="{link controller='SitemapList'}{/link}" class="button">{icon name='list'} <span>{lang}wcf.acp.menu.link.maintenance.sitemap{/lang}</span></a></li>
-			
-			{event name='contentHeaderNavigation'}
-		</ul>
-	</nav>
+	{hascontent}
+		<nav class="contentHeaderNavigation">
+			<ul>
+				{content}
+					{event name='contentHeaderNavigation'}
+				{/content}
+			</ul>
+		</nav>
+	{/hascontent}
 </header>
 
 {unsafe:$form->getHtml()}

From 6fab6e630c700ee1012fb6993104947e32aa1cbf Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 9 Sep 2026 11:54:56 +0200
Subject: [PATCH 06/10] Remove the priority value from sitemap objects

bc Google ignores the value anyways.
---
 com.woltlab.wcf/templates/shared_sitemapEntry.tpl   |  1 -
 .../object/type/SitemapObjectTypeAction.class.php   |  1 -
 .../system/gridView/admin/SitemapGridView.class.php |  5 -----
 .../ObjectTypePackageInstallationPlugin.class.php   | 13 +------------
 .../object/RegisteredSitemapObject.class.php        |  9 ---------
 .../system/worker/SitemapRebuildWorker.class.php    |  1 -
 wcfsetup/install/lang/de.xml                        |  3 ---
 wcfsetup/install/lang/en.xml                        |  3 ---
 8 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/com.woltlab.wcf/templates/shared_sitemapEntry.tpl b/com.woltlab.wcf/templates/shared_sitemapEntry.tpl
index da372aa3b5a..23ae8e491b6 100755
--- a/com.woltlab.wcf/templates/shared_sitemapEntry.tpl
+++ b/com.woltlab.wcf/templates/shared_sitemapEntry.tpl
@@ -2,5 +2,4 @@
 	<loc>{$link}</loc>
 	{if $lastModifiedTime}<lastmod>{$lastModifiedTime}</lastmod>{/if}
 	<changefreq>{$changeFreq}</changefreq>
-	<priority>{$priority}</priority>
 </url>
diff --git a/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php b/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php
index 4d738ddebb5..d2fa7638ff6 100644
--- a/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php
+++ b/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php
@@ -48,7 +48,6 @@ public function toggle()
                 $sitemapData['isDisabled'] = $sitemapData['isDisabled'] !== 0 ? 0 : 1;
             } else {
                 $sitemapData = [
-                    'priority' => $objectEditor->priority,
                     'changeFreq' => $objectEditor->changeFreq,
                     'rebuildTime' => $objectEditor->rebuildTime,
                     'isDisabled' => (int)$objectEditor->isDisabled !== 0 ? 0 : 1,
diff --git a/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php b/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php
index 82e3626f996..26140afb697 100644
--- a/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php
+++ b/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php
@@ -11,7 +11,6 @@
 use wcf\system\gridView\GridViewColumn;
 use wcf\system\gridView\GridViewRowLink;
 use wcf\system\gridView\renderer\DefaultColumnRenderer;
-use wcf\system\gridView\renderer\NumberColumnRenderer;
 use wcf\system\interaction\ToggleInteraction;
 use wcf\system\request\LinkHandler;
 use wcf\system\sitemap\object\RegisteredSitemapObject;
@@ -41,9 +40,6 @@ public function __construct()
                 ->label('wcf.acp.sitemap')
                 ->titleColumn()
                 ->sortable(),
-            GridViewColumn::for('priority')
-                ->label('wcf.acp.sitemap.priority')
-                ->renderer(new NumberColumnRenderer()),
             GridViewColumn::for('changeFreq')
                 ->label('wcf.acp.sitemap.changeFreq')
                 ->renderer(new class extends DefaultColumnRenderer {
@@ -178,7 +174,6 @@ private function createRow(RegisteredSitemapObject $object): DatabaseObject
         return new class(null, [
             'objectName' => $object->getObjectName(),
             'name' => $object->getName(),
-            'priority' => $object->getPriority(),
             'changeFreq' => $handler->getChangeFreq($object),
             'rebuildTime' => $handler->getRebuildTime($object),
             'isDisabled' => $handler->isDisabled($object) ? 1 : 0,
diff --git a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
index 1b35c5d4b7c..90ed1e17a32 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
@@ -24,7 +24,6 @@
 use wcf\system\form\builder\field\BooleanFormField;
 use wcf\system\form\builder\field\ClassNameFormField;
 use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
-use wcf\system\form\builder\field\FloatFormField;
 use wcf\system\form\builder\field\IntegerFormField;
 use wcf\system\form\builder\field\ItemListFormField;
 use wcf\system\form\builder\field\option\OptionFormField;
@@ -660,16 +659,6 @@ static function (UserGroupOptionFormField $formField) {
         // @deprecated 6.3 use `wcf\event\sitemap\SitemapObjectCollecting` instead
         $this->getObjectTypeDefinitionDataContainer($form, 'com.woltlab.wcf.sitemap.object')
             ->appendChildren([
-                FloatFormField::create('sitemapObjectPriority')
-                    ->objectProperty('priority')
-                    ->label('wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.priority')
-                    ->description('wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.priority.description')
-                    ->required()
-                    ->minimum(0.0)
-                    ->maximum(1.0)
-                    ->step(0.1)
-                    ->value(0.5),
-
                 SingleSelectionFormField::create('sitemapObjectchangeFreq')
                     ->objectProperty('changeFreq')
                     ->label('wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq')
@@ -693,7 +682,7 @@ static function (UserGroupOptionFormField $formField) {
                     ->required()
                     ->minimum(0),
             ]);
-        $this->definitionElementChildren['com.woltlab.wcf.sitemap.object'] = ['priority', 'changeFreq', 'rebuildTime'];
+        $this->definitionElementChildren['com.woltlab.wcf.sitemap.object'] = ['changeFreq', 'rebuildTime'];
 
         // com.woltlab.wcf.statDailyHandler
         $this->getObjectTypeDefinitionDataContainer($form, 'com.woltlab.wcf.statDailyHandler')
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
index b686fe98762..86a9be811e9 100644
--- a/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
@@ -19,8 +19,6 @@
  */
 final class RegisteredSitemapObject
 {
-    public const DEFAULT_PRIORITY = 0.5;
-
     public const DEFAULT_CHANGE_FREQ = 'monthly';
 
     public const DEFAULT_REBUILD_TIME = 604800;
@@ -35,7 +33,6 @@ final class RegisteredSitemapObject
     public function __construct(
         private readonly string $objectName,
         private readonly ISitemapObjectObjectType $processor,
-        private readonly float $priority = self::DEFAULT_PRIORITY,
         private readonly string $changeFreq = self::DEFAULT_CHANGE_FREQ,
         private readonly int $rebuildTime = self::DEFAULT_REBUILD_TIME,
         private readonly ?int $packageID = null,
@@ -55,7 +52,6 @@ public static function fromObjectType(ObjectType $objectType): self
         return new self(
             $objectType->objectType,
             $processor,
-            $objectType->priority !== null ? (float)$objectType->priority : self::DEFAULT_PRIORITY,
             $objectType->changeFreq ?? self::DEFAULT_CHANGE_FREQ,
             $objectType->rebuildTime !== null ? (int)$objectType->rebuildTime : self::DEFAULT_REBUILD_TIME,
             $objectType->packageID,
@@ -90,11 +86,6 @@ public function getProcessor(): ISitemapObjectObjectType
         return $this->processor;
     }
 
-    public function getPriority(): float
-    {
-        return $this->priority;
-    }
-
     /**
      * Returns the change frequency configured by the developer. The value that is
      * actually used may be overwritten by the administrator, see
diff --git a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
index 1f21fd9d1ed..6063f92db6d 100755
--- a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
@@ -202,7 +202,6 @@ public function execute()
                         // strip session links
                         'link' => MessageUtil::stripCrap($link),
                         'lastModifiedTime' => $lastModifiedTime,
-                        'priority' => $registeredObject->getPriority(),
                         'changeFreq' => SitemapHandler::getInstance()->getChangeFreq($registeredObject),
                     ]));
 
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a986ba2b3b2..905eda29780 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2500,8 +2500,6 @@ Die Datenbestände werden sorgfältig gepflegt, aber es ist nicht ausgeschlossen
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq"><![CDATA[Änderungsfrequenz]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq.description"><![CDATA[Die Änderungsfrequenz informiert Crawler darüber, wie oft sich eine Seite durchschnittlich ändert.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.data.title"><![CDATA[Daten des Sitemap-Objekts]]></item>
-		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.priority"><![CDATA[Priorität]]></item>
-		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.priority.description"><![CDATA[Die Priorität informiert Crawler darüber, welche Seiten {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} als wichtiger {if LANGUAGE_USE_INFORMAL_VARIANT}erachtest{else}erachten{/if} als der Rest der Website.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.rebuildTime"><![CDATA[Erneuerungszeit]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.rebuildTime.description"><![CDATA[Nach dem angegebenen Zeitintervall wird die Sitemap vom System erneuert.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.statDailyHandler.categoryName"><![CDATA[Kategorie]]></item>
@@ -2718,7 +2716,6 @@ Abschnitte dürfen nicht leer sein und nur folgende Zeichen enthalten: <kbd>[a-z
 	</category>
 	<category name="wcf.acp.sitemap">
 		<item name="wcf.acp.sitemap"><![CDATA[Sitemap]]></item>
-		<item name="wcf.acp.sitemap.priority"><![CDATA[Priorität]]></item>
 		<item name="wcf.acp.sitemap.changeFreq"><![CDATA[Änderungsfrequenz]]></item>
 		<item name="wcf.acp.sitemap.changeFreq.always"><![CDATA[Immer]]></item>
 		<item name="wcf.acp.sitemap.changeFreq.hourly"><![CDATA[Stündlich]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 0885d1aed60..c56ca15fdf1 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2092,8 +2092,6 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.searchableObjectType.searchIndex.error.invalid"><![CDATA[The entered database table name is invalid.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.searchableObjectType.searchIndex.error.unknownApp"><![CDATA[No app with the abbreviation <kbd>{@$app}</kbd> is installed.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.data.title"><![CDATA[Sitemap Object Data]]></item>
-		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.priority"><![CDATA[Priority]]></item>
-		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.priority.description"><![CDATA[The priority tells crawlers which of your website’s pages you consider more important than the rest.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq"><![CDATA[Change Frequency]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq.description"><![CDATA[The change frequency tells crawlers how often a page changes on average.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.rebuildTime"><![CDATA[Rebuild Time]]></item>
@@ -2647,7 +2645,6 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 	</category>
 	<category name="wcf.acp.sitemap">
 		<item name="wcf.acp.sitemap"><![CDATA[Sitemap]]></item>
-		<item name="wcf.acp.sitemap.priority"><![CDATA[Priority]]></item>
 		<item name="wcf.acp.sitemap.changeFreq"><![CDATA[Change Frequency]]></item>
 		<item name="wcf.acp.sitemap.changeFreq.always"><![CDATA[Always]]></item>
 		<item name="wcf.acp.sitemap.changeFreq.hourly"><![CDATA[Hourly]]></item>

From 7b7ce296370732714ad61258e8b6b498182331d6 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 9 Sep 2026 12:00:56 +0200
Subject: [PATCH 07/10] Remove the change frequency from sitemap objects

bc Google ignores the value anyways.
---
 .../templates/shared_sitemapEntry.tpl           |  1 -
 .../lib/acp/form/SitemapEditForm.class.php      | 15 ---------------
 .../files/lib/bootstrap/com.woltlab.wcf.php     |  1 -
 .../type/SitemapObjectTypeAction.class.php      |  1 -
 .../gridView/admin/SitemapGridView.class.php    | 10 ----------
 ...bjectTypePackageInstallationPlugin.class.php | 17 +----------------
 .../lib/system/sitemap/SitemapHandler.class.php | 14 --------------
 .../object/RegisteredSitemapObject.class.php    | 14 --------------
 .../worker/SitemapRebuildWorker.class.php       |  2 --
 wcfsetup/install/lang/de.xml                    | 10 ----------
 wcfsetup/install/lang/en.xml                    | 10 ----------
 11 files changed, 1 insertion(+), 94 deletions(-)

diff --git a/com.woltlab.wcf/templates/shared_sitemapEntry.tpl b/com.woltlab.wcf/templates/shared_sitemapEntry.tpl
index 23ae8e491b6..362a0eb977a 100755
--- a/com.woltlab.wcf/templates/shared_sitemapEntry.tpl
+++ b/com.woltlab.wcf/templates/shared_sitemapEntry.tpl
@@ -1,5 +1,4 @@
 <url>
 	<loc>{$link}</loc>
 	{if $lastModifiedTime}<lastmod>{$lastModifiedTime}</lastmod>{/if}
-	<changefreq>{$changeFreq}</changefreq>
 </url>
diff --git a/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php b/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php
index f59f380f1cf..fa1f8c23c20 100755
--- a/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php
@@ -10,7 +10,6 @@
 use wcf\system\form\builder\container\FormContainer;
 use wcf\system\form\builder\field\BooleanFormField;
 use wcf\system\form\builder\field\IntegerFormField;
-use wcf\system\form\builder\field\SingleSelectionFormField;
 use wcf\system\form\builder\IFormDocument;
 use wcf\system\request\LinkHandler;
 use wcf\system\sitemap\object\RegisteredSitemapObject;
@@ -84,19 +83,6 @@ protected function createForm()
         $this->form->appendChildren([
             FormContainer::create('section')
                 ->appendChildren([
-                    SingleSelectionFormField::create('changeFreq')
-                        ->label('wcf.acp.sitemap.changeFreq')
-                        ->options([
-                            'always' => 'wcf.acp.sitemap.changeFreq.always',
-                            'hourly' => 'wcf.acp.sitemap.changeFreq.hourly',
-                            'daily' => 'wcf.acp.sitemap.changeFreq.daily',
-                            'weekly' => 'wcf.acp.sitemap.changeFreq.weekly',
-                            'monthly' => 'wcf.acp.sitemap.changeFreq.monthly',
-                            'yearly' => 'wcf.acp.sitemap.changeFreq.yearly',
-                            'never' => 'wcf.acp.sitemap.changeFreq.never',
-                        ])
-                        ->value(SitemapHandler::getInstance()->getChangeFreq($this->sitemapObject))
-                        ->required(),
                     IntegerFormField::create('rebuildTime')
                         ->label('wcf.acp.sitemap.rebuildTime')
                         ->description('wcf.acp.sitemap.rebuildTime.description')
@@ -120,7 +106,6 @@ public function save()
 
         SitemapHandler::getInstance()->setConfiguration(
             $this->sitemapObject,
-            $formData['changeFreq'],
             (int)$formData['rebuildTime'],
             (bool)$formData['isDisabled']
         );
diff --git a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
index 9261b7ed704..93441da6eea 100644
--- a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
+++ b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
@@ -140,7 +140,6 @@ static function (\wcf\event\sitemap\SitemapObjectCollecting $event) {
                 $event->register(new \wcf\system\sitemap\object\RegisteredSitemapObject(
                     'com.woltlab.wcf.sitemap.object.articleCategory',
                     new \wcf\system\sitemap\object\ArticleCategorySitemapObject(),
-                    changeFreq: 'weekly',
                     rebuildTime: 2592000,
                 ));
                 $event->register(new \wcf\system\sitemap\object\RegisteredSitemapObject(
diff --git a/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php b/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php
index d2fa7638ff6..9c96e59e74e 100644
--- a/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php
+++ b/wcfsetup/install/files/lib/data/object/type/SitemapObjectTypeAction.class.php
@@ -48,7 +48,6 @@ public function toggle()
                 $sitemapData['isDisabled'] = $sitemapData['isDisabled'] !== 0 ? 0 : 1;
             } else {
                 $sitemapData = [
-                    'changeFreq' => $objectEditor->changeFreq,
                     'rebuildTime' => $objectEditor->rebuildTime,
                     'isDisabled' => (int)$objectEditor->isDisabled !== 0 ? 0 : 1,
                 ];
diff --git a/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php b/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php
index 26140afb697..c94cdeaf9d5 100644
--- a/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php
+++ b/wcfsetup/install/files/lib/system/gridView/admin/SitemapGridView.class.php
@@ -40,15 +40,6 @@ public function __construct()
                 ->label('wcf.acp.sitemap')
                 ->titleColumn()
                 ->sortable(),
-            GridViewColumn::for('changeFreq')
-                ->label('wcf.acp.sitemap.changeFreq')
-                ->renderer(new class extends DefaultColumnRenderer {
-                    #[\Override]
-                    public function render(mixed $value, DatabaseObject $row): string
-                    {
-                        return WCF::getLanguage()->get('wcf.acp.sitemap.changeFreq.' . (string)$value);
-                    }
-                }),
             GridViewColumn::for('rebuildTime')
                 ->label('wcf.acp.sitemap.rebuildTime')
                 ->renderer(new class extends DefaultColumnRenderer {
@@ -174,7 +165,6 @@ private function createRow(RegisteredSitemapObject $object): DatabaseObject
         return new class(null, [
             'objectName' => $object->getObjectName(),
             'name' => $object->getName(),
-            'changeFreq' => $handler->getChangeFreq($object),
             'rebuildTime' => $handler->getRebuildTime($object),
             'isDisabled' => $handler->isDisabled($object) ? 1 : 0,
         ]) extends DatabaseObject implements ILinkableObject {
diff --git a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
index 90ed1e17a32..727bb5bb28c 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
@@ -659,21 +659,6 @@ static function (UserGroupOptionFormField $formField) {
         // @deprecated 6.3 use `wcf\event\sitemap\SitemapObjectCollecting` instead
         $this->getObjectTypeDefinitionDataContainer($form, 'com.woltlab.wcf.sitemap.object')
             ->appendChildren([
-                SingleSelectionFormField::create('sitemapObjectchangeFreq')
-                    ->objectProperty('changeFreq')
-                    ->label('wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq')
-                    ->description('wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq.description')
-                    ->options([
-                        'always' => 'always',
-                        'hourly' => 'hourly',
-                        'daily' => 'daily',
-                        'weekly' => 'weekly',
-                        'monthly' => 'monthly',
-                        'yearly' => 'yearly',
-                        'never' => 'never',
-                    ])
-                    ->required(),
-
                 IntegerFormField::create('sitemapObjectRebuildTime')
                     ->objectProperty('rebuildTime')
                     ->label('wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.rebuildTime')
@@ -682,7 +667,7 @@ static function (UserGroupOptionFormField $formField) {
                     ->required()
                     ->minimum(0),
             ]);
-        $this->definitionElementChildren['com.woltlab.wcf.sitemap.object'] = ['changeFreq', 'rebuildTime'];
+        $this->definitionElementChildren['com.woltlab.wcf.sitemap.object'] = ['rebuildTime'];
 
         // com.woltlab.wcf.statDailyHandler
         $this->getObjectTypeDefinitionDataContainer($form, 'com.woltlab.wcf.statDailyHandler')
diff --git a/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php b/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php
index d7016f3ad16..0d1a5611ab6 100644
--- a/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php
@@ -50,17 +50,6 @@ public function getObject(string $objectName): ?RegisteredSitemapObject
         return $this->objects[$objectName] ?? null;
     }
 
-    /**
-     * Returns the change frequency of the given object, taking the
-     * configuration of the administrator into account.
-     */
-    public function getChangeFreq(RegisteredSitemapObject $object): string
-    {
-        $data = $this->getConfiguration($object->getObjectName());
-
-        return isset($data['changeFreq']) ? (string)$data['changeFreq'] : $object->getChangeFreq();
-    }
-
     /**
      * Returns the rebuild time of the given object, taking the
      * configuration of the administrator into account.
@@ -87,7 +76,6 @@ public function isDisabled(RegisteredSitemapObject $object): bool
      */
     public function setConfiguration(
         RegisteredSitemapObject $object,
-        string $changeFreq,
         int $rebuildTime,
         bool $isDisabled
     ): void {
@@ -95,7 +83,6 @@ public function setConfiguration(
             'com.woltlab.wcf',
             self::REGISTRY_PREFIX . $object->getObjectName(),
             \serialize([
-                'changeFreq' => $changeFreq,
                 'rebuildTime' => $rebuildTime,
                 'isDisabled' => $isDisabled ? 1 : 0,
             ])
@@ -109,7 +96,6 @@ public function setIsDisabled(RegisteredSitemapObject $object, bool $isDisabled)
     {
         $this->setConfiguration(
             $object,
-            $this->getChangeFreq($object),
             $this->getRebuildTime($object),
             $isDisabled
         );
diff --git a/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
index 86a9be811e9..87e093e841d 100644
--- a/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/RegisteredSitemapObject.class.php
@@ -19,8 +19,6 @@
  */
 final class RegisteredSitemapObject
 {
-    public const DEFAULT_CHANGE_FREQ = 'monthly';
-
     public const DEFAULT_REBUILD_TIME = 604800;
 
     /**
@@ -33,7 +31,6 @@ final class RegisteredSitemapObject
     public function __construct(
         private readonly string $objectName,
         private readonly ISitemapObjectObjectType $processor,
-        private readonly string $changeFreq = self::DEFAULT_CHANGE_FREQ,
         private readonly int $rebuildTime = self::DEFAULT_REBUILD_TIME,
         private readonly ?int $packageID = null,
         private readonly bool $isDisabled = false,
@@ -52,7 +49,6 @@ public static function fromObjectType(ObjectType $objectType): self
         return new self(
             $objectType->objectType,
             $processor,
-            $objectType->changeFreq ?? self::DEFAULT_CHANGE_FREQ,
             $objectType->rebuildTime !== null ? (int)$objectType->rebuildTime : self::DEFAULT_REBUILD_TIME,
             $objectType->packageID,
             (bool)$objectType->isDisabled,
@@ -86,16 +82,6 @@ public function getProcessor(): ISitemapObjectObjectType
         return $this->processor;
     }
 
-    /**
-     * Returns the change frequency configured by the developer. The value that is
-     * actually used may be overwritten by the administrator, see
-     * `wcf\system\sitemap\SitemapHandler::getChangeFreq()`.
-     */
-    public function getChangeFreq(): string
-    {
-        return $this->changeFreq;
-    }
-
     /**
      * Returns the rebuild time configured by the developer. The value that is
      * actually used may be overwritten by the administrator, see
diff --git a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
index 6063f92db6d..d76e6224a37 100755
--- a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
@@ -196,13 +196,11 @@ public function execute()
                     $object->{$sitemapObject->getLastModifiedColumn()}
                 );
 
-                $registeredObject = $this->sitemapObjects[$this->workerData['sitemap']];
                 if ($sitemapObject->canView($object)) {
                     $this->file->write(WCF::getTPL()->render('wcf', 'shared_sitemapEntry', [
                         // strip session links
                         'link' => MessageUtil::stripCrap($link),
                         'lastModifiedTime' => $lastModifiedTime,
-                        'changeFreq' => SitemapHandler::getInstance()->getChangeFreq($registeredObject),
                     ]));
 
                     $this->workerData['dataCount']++;
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 905eda29780..068f5cabf9a 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2497,8 +2497,6 @@ Die Datenbestände werden sorgfältig gepflegt, aber es ist nicht ausgeschlossen
 		<item name="wcf.acp.pip.objectType.condition.conditionObject"><![CDATA[Bezeichner der „bedingten“ Objekte]]></item>
 		<item name="wcf.acp.pip.objectType.condition.conditionObject.description"><![CDATA[Der Objekttyp-ähnliche Bezeichner der Objekte, auf die sich diese Bedingung bezieht, wird dazu verwendet eine größere Menge an Bedingungen in thematisch zusammengehörige Gruppen aufzuspalten.]]></item>
 		<item name="wcf.acp.pip.objectType.condition.conditionObject.error.tooFewSegments"><![CDATA[Der angegebene Bezeichner enthält nur {#$segmentCount} Abschnitt{if $segmentCount > 1}e{/if}.]]></item>
-		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq"><![CDATA[Änderungsfrequenz]]></item>
-		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq.description"><![CDATA[Die Änderungsfrequenz informiert Crawler darüber, wie oft sich eine Seite durchschnittlich ändert.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.data.title"><![CDATA[Daten des Sitemap-Objekts]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.rebuildTime"><![CDATA[Erneuerungszeit]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.rebuildTime.description"><![CDATA[Nach dem angegebenen Zeitintervall wird die Sitemap vom System erneuert.]]></item>
@@ -2716,14 +2714,6 @@ Abschnitte dürfen nicht leer sein und nur folgende Zeichen enthalten: <kbd>[a-z
 	</category>
 	<category name="wcf.acp.sitemap">
 		<item name="wcf.acp.sitemap"><![CDATA[Sitemap]]></item>
-		<item name="wcf.acp.sitemap.changeFreq"><![CDATA[Änderungsfrequenz]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.always"><![CDATA[Immer]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.hourly"><![CDATA[Stündlich]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.daily"><![CDATA[Täglich]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.weekly"><![CDATA[Wöchentlich]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.monthly"><![CDATA[Monatlich]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.yearly"><![CDATA[Jährlich]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.never"><![CDATA[Nie]]></item>
 		<item name="wcf.acp.sitemap.rebuildTime"><![CDATA[Erneuerungszeit]]></item>
 		<item name="wcf.acp.sitemap.rebuildTime.description"><![CDATA[Die Zeit nachdem die Sitemap erneuert werden soll.]]></item>
 		<item name="wcf.acp.sitemap.isDisabled"><![CDATA[Sitemap deaktivieren]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c56ca15fdf1..dd4bcb36639 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2092,8 +2092,6 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.searchableObjectType.searchIndex.error.invalid"><![CDATA[The entered database table name is invalid.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.searchableObjectType.searchIndex.error.unknownApp"><![CDATA[No app with the abbreviation <kbd>{@$app}</kbd> is installed.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.data.title"><![CDATA[Sitemap Object Data]]></item>
-		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq"><![CDATA[Change Frequency]]></item>
-		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.changeFreq.description"><![CDATA[The change frequency tells crawlers how often a page changes on average.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.rebuildTime"><![CDATA[Rebuild Time]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.sitemap.object.rebuildTime.description"><![CDATA[After the entered time interval, the sitemap will be rebuilt by the system.]]></item>
 		<item name="wcf.acp.pip.objectType.com.woltlab.wcf.statDailyHandler.data.title"><![CDATA[Statistics Entry Data]]></item>
@@ -2645,14 +2643,6 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 	</category>
 	<category name="wcf.acp.sitemap">
 		<item name="wcf.acp.sitemap"><![CDATA[Sitemap]]></item>
-		<item name="wcf.acp.sitemap.changeFreq"><![CDATA[Change Frequency]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.always"><![CDATA[Always]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.hourly"><![CDATA[Hourly]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.daily"><![CDATA[Daily]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.weekly"><![CDATA[Weekly]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.monthly"><![CDATA[Monthly]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.yearly"><![CDATA[Yearly]]></item>
-		<item name="wcf.acp.sitemap.changeFreq.never"><![CDATA[Never]]></item>
 		<item name="wcf.acp.sitemap.rebuildTime"><![CDATA[Rebuild Time]]></item>
 		<item name="wcf.acp.sitemap.rebuildTime.description"><![CDATA[Time interval after which the sitemap has to be rebuilt.]]></item>
 		<item name="wcf.acp.sitemap.isDisabled"><![CDATA[Disable Sitemap]]></item>

From bc8531d508813a57cea823f39b38c8a1dd7bc008 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 9 Sep 2026 12:37:14 +0200
Subject: [PATCH 08/10] Ensure a deterministic order when reading sitemap
 objects

---
 .../files/lib/system/worker/SitemapRebuildWorker.class.php     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
index d76e6224a37..6288afa563b 100755
--- a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
@@ -183,6 +183,9 @@ public function execute()
 
             $objectList->sqlLimit = $this->limit;
             $objectList->sqlOffset = $this->limit * $sitemapLoopCount;
+            if ($objectList->sqlOrderBy === '') {
+                $objectList->sqlOrderBy = $objectList->getDatabaseTableAlias() . '.' . $objectList->getDatabaseTableIndexName();
+            }
             $objectList->readObjects();
 
             foreach ($objectList->getObjects() as $object) {

From b213ebbc23f7c3f9bfc2e570e0308dfda69fb846 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 9 Sep 2026 12:50:32 +0200
Subject: [PATCH 09/10] Fix sitemap rebuild aborting before the index file is
 written

---
 .../worker/SitemapRebuildWorker.class.php     | 135 +++++++++++++-----
 1 file changed, 100 insertions(+), 35 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
index 6288afa563b..db23f8c5690 100755
--- a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
@@ -41,6 +41,17 @@ class SitemapRebuildWorker extends AbstractRebuildDataWorker
      */
     const REGISTRY_PREFIX = SitemapHandler::REGISTRY_PREFIX;
 
+    /**
+     * Name of the session variable that holds the current worker data.
+     */
+    private const WORKER_DATA_SESSION_VAR = 'sitemapRebuildWorkerData';
+
+    /**
+     * Name of the session variable that holds the total number of iterations.
+     * The value is calculated once per rebuild, see `countObjects()`.
+     */
+    private const COUNT_SESSION_VAR = 'sitemapRebuildWorkerCount';
+
     /**
      * @inheritDoc
      */
@@ -81,44 +92,67 @@ public function initObjectList()
     #[\Override]
     public function countObjects()
     {
+        if ($this->count !== null) {
+            return;
+        }
+
         // changes session owner to 'System' during the building of sitemaps
         $this->changeUserToGuest();
 
         try {
-            if ($this->count === null) {
-                // reset count
-                $this->count = 0;
-
-                // read sitemaps
-                $sitemapObjects = SitemapHandler::getInstance()->getObjects();
-                foreach ($sitemapObjects as $sitemapObject) {
-                    $processor = $sitemapObject->getProcessor();
-
-                    if (
-                        $processor->isAvailableType()
-                        && !SitemapHandler::getInstance()->isDisabled($sitemapObject)
-                    ) {
-                        $this->sitemapObjects[] = $sitemapObject;
-
-                        $list = $processor->getObjectList();
-
-                        if (\SITEMAP_INDEX_TIME_FRAME > 0 && $processor->getLastModifiedColumn() !== null) {
-                            $list->getConditionBuilder()->add($processor->getLastModifiedColumn() . " > ?", [
-                                \TIME_NOW - \SITEMAP_INDEX_TIME_FRAME * 86400, // one day (60 * 60 * 24)
-                            ]);
-                        }
-
-                        $objectCount = $list->countObjects();
-                        $iterations = (int)\ceil($objectCount / $this->limit);
-                        if (($objectCount % $this->limit) === 0) {
-                            // We need an additional iteration to finalize the sitemap.
-                            $iterations++;
-                        }
-                        $this->count += $iterations * $this->limit;
-                    } else {
-                        $this->deleteSitemaps($sitemapObject->getObjectName());
-                    }
+            // The number of iterations is calculated once at the start of a rebuild and
+            // is reused for every following request. Recalculating it would yield a
+            // smaller value over time, because the condition based on the option
+            // `SITEMAP_INDEX_TIME_FRAME` is relative to `TIME_NOW`. The progress would
+            // then reach 100% before the last sitemap has been written, causing the
+            // caller to abort the rebuild before the index file is created.
+            $storedCount = $this->loopCount === 0
+                ? null
+                : WCF::getSession()->getVar(self::COUNT_SESSION_VAR);
+
+            // reset count
+            $this->count = 0;
+
+            // read sitemaps
+            $sitemapObjects = SitemapHandler::getInstance()->getObjects();
+            foreach ($sitemapObjects as $sitemapObject) {
+                $processor = $sitemapObject->getProcessor();
+
+                if (
+                    !$processor->isAvailableType()
+                    || SitemapHandler::getInstance()->isDisabled($sitemapObject)
+                ) {
+                    $this->deleteSitemaps($sitemapObject->getObjectName());
+                    continue;
                 }
+
+                $this->sitemapObjects[] = $sitemapObject;
+
+                if ($storedCount !== null) {
+                    continue;
+                }
+
+                $list = $processor->getObjectList();
+
+                if (\SITEMAP_INDEX_TIME_FRAME > 0 && $processor->getLastModifiedColumn() !== null) {
+                    $list->getConditionBuilder()->add($processor->getLastModifiedColumn() . " > ?", [
+                        \TIME_NOW - \SITEMAP_INDEX_TIME_FRAME * 86400, // one day (60 * 60 * 24)
+                    ]);
+                }
+
+                $objectCount = $list->countObjects();
+                $iterations = (int)\ceil($objectCount / $this->limit);
+                if (($objectCount % $this->limit) === 0) {
+                    // We need an additional iteration to finalize the sitemap.
+                    $iterations++;
+                }
+                $this->count += $iterations * $this->limit;
+            }
+
+            if ($storedCount !== null) {
+                $this->count = (int)$storedCount;
+            } else {
+                WCF::getSession()->register(self::COUNT_SESSION_VAR, $this->count);
             }
         } finally {
             // change session owner back to the actual user
@@ -126,6 +160,22 @@ public function countObjects()
         }
     }
 
+    #[\Override]
+    public function getProgress()
+    {
+        $progress = parent::getProgress();
+
+        // The rebuild is only complete once the sitemap index file has been written.
+        // Reporting 100% any earlier causes the caller to stop the rebuild although
+        // the previous sitemap files have already been deleted, leaving behind a
+        // `sitemap.xml` that references files that no longer exist.
+        if ($progress === 100 && !$this->hasFinished()) {
+            return 99;
+        }
+
+        return $progress;
+    }
+
     #[\Override]
     public function execute()
     {
@@ -415,7 +465,7 @@ private function registerSitemapFiles(): void
      */
     protected function storeWorkerData()
     {
-        WCF::getSession()->register('sitemapRebuildWorkerData', $this->workerData);
+        WCF::getSession()->register(self::WORKER_DATA_SESSION_VAR, $this->workerData);
     }
 
     /**
@@ -425,7 +475,7 @@ protected function storeWorkerData()
      */
     protected function loadWorkerData()
     {
-        $this->workerData = WCF::getSession()->getVar('sitemapRebuildWorkerData');
+        $this->workerData = WCF::getSession()->getVar(self::WORKER_DATA_SESSION_VAR);
 
         if ($this->loopCount === 0) {
             $this->workerData = [
@@ -442,6 +492,21 @@ protected function loadWorkerData()
         }
     }
 
+    /**
+     * Returns whether the rebuild has been completed, including the sitemap index file.
+     */
+    private function hasFinished(): bool
+    {
+        if ($this->loopCount < 1) {
+            // Any stored data still belongs to the previous rebuild.
+            return false;
+        }
+
+        $workerData = WCF::getSession()->getVar(self::WORKER_DATA_SESSION_VAR);
+
+        return \is_array($workerData) && ($workerData['finished'] ?? false) === true;
+    }
+
     #[\Override]
     public function validate()
     {

From 74230f8acb770462b52a5a7ff6d1dfa38865ac09 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 9 Sep 2026 12:58:20 +0200
Subject: [PATCH 10/10] Move the sitemap object name into the content title

---
 wcfsetup/install/files/acp/templates/sitemapEdit.tpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/sitemapEdit.tpl b/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
index 190b46aff7c..1c58ce9e30b 100755
--- a/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapEdit.tpl
@@ -2,8 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.sitemap.edit{/lang}</h1>
-		<p class="contentHeaderDescription">{$sitemapObject->getName()}</p>
+		<h1 class="contentTitle">{lang}wcf.acp.sitemap.edit{/lang}: {$sitemapObject->getName()}</h1>
 	</div>
 	
 	{hascontent}