Fix handling of CMS pages in sitemap

Delegate the visibility control and access control to the appropriate methods
in \wcf\data\page\Page instead of reimplementing it from scratch. Most notably
the inversion of the page ACL was not implemented correctly within the sitemap.

see 92fba0538afc1d88f411db1a80553af2d17c09b4
Closes #4767

Co-authored-by: mutec <mysterycode@mysterycode.de>

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 179a06fe462e3c4b8b270cc3baa85ef923ac6d06..918f9804bd8af152de750e22722d46bfd55c3e66 100644 (file)
--- a/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/MultilingualPageSitemapObject.class.php
@@ -7,7 +7,6 @@ use wcf\data\page\content\PageContent;
 use wcf\data\page\content\PageContentList;
 use wcf\data\page\Page;
 use wcf\page\AbstractPage;
-use wcf\system\acl\simple\SimpleAclResolver;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
 
@@ -58,23 +57,15 @@ class MultilingualPageSitemapObject extends AbstractSitemapObjectObjectType
         /** @var $object PageContent */
         $page = new Page($object->pageID);
 
-        if ($page->isDisabled) {
-            return false;
-        }
-
         if ($page->requireObjectID) {
             return false;
         }
 
-        if (!$page->validateOptions()) {
-            return false;
-        }
-
-        if (!$page->validatePermissions()) {
+        if (!$page->isVisible()) {
             return false;
         }
 
-        if (!SimpleAclResolver::getInstance()->canAccess('com.woltlab.wcf.page', $object->pageID)) {
+        if (!$page->isAccessible()) {
             return false;
         }
 

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 20964d45e309446b8e86ba3d6073074251172487..a852907a270cc91ca112f7e05286067e107bd39c 100644 (file)
--- a/wcfsetup/install/files/lib/system/sitemap/object/SimplePageSitemapObject.class.php
+++ b/wcfsetup/install/files/lib/system/sitemap/object/SimplePageSitemapObject.class.php
@@ -6,7 +6,6 @@ use wcf\data\DatabaseObject;
 use wcf\data\page\Page;
 use wcf\data\page\PageList;
 use wcf\page\AbstractPage;
-use wcf\system\acl\simple\SimpleAclResolver;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
 
@@ -47,24 +46,17 @@ class SimplePageSitemapObject extends AbstractSitemapObjectObjectType
      */
     public function canView(DatabaseObject $object)
     {
-        /** @var Page $object */
-        if ($object->isDisabled) {
-            return false;
-        }
+        \assert($object instanceof Page);
 
         if ($object->requireObjectID) {
             return false;
         }
 
-        if (!$object->validateOptions()) {
-            return false;
-        }
-
-        if (!$object->validatePermissions()) {
+        if (!$object->isVisible()) {
             return false;
         }
 
-        if (!SimpleAclResolver::getInstance()->canAccess('com.woltlab.wcf.page', $object->pageID)) {
+        if (!$object->isAccessible()) {
             return false;
         }