Removed obsolete code / xml definitions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8a88ed7b19d78a867684118955018a55bcd4f4d..d0319da22c97d4f31a092b33a42bf1addb195bba 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@
 
 #### CMS
 
-* User online location is handled via the `wcf\data\page\Page` objects. Static locations only need a language item `wcf.page.onlineLocation.{$page->identifier}`, more complex locations can use the online location-related methods of `wcf\system\page\handler\IMenuPageHandler`. For CMS pages, their title is used.
+* User online location is handled via the `wcf\data\page\Page` objects. Complex locations can use the online location-related methods of `wcf\system\page\handler\IMenuPageHandler`.
 
 #### New Traits
 
@@ -59,9 +59,15 @@
 * `wcf\system\clipboard\action\UserExtendedClipboardAction` removed.
 * `wcf\system\event\listener\PreParserAtUserListener` removed.
 * `wcf\action\AJAXProxyAction::getData()` removed.
+* `wcf\system\page\PageManager` removed.
+* `wcf\system\option\PageMultiSelectOptionType` removed.
+* `wcf\system\option\PageSelectOptionType` removed.
+* `wcf\system\user\online\location\UserLocation` removed.
 * Version system removed.
 * Support for query string based sessions in Frontend removed.
 * Language server system removed.
+* Object type definition `com.woltlab.wcf.user.online.location` removed.
+* Object type definition `com.woltlab.wcf.page` removed.
 
 #### Documentation
 

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index d2ba8179fccfc5a6e90638363189095c366fff79..df9fcecad9fe3c73389d002f8fc4b8690948af18 100644 (file)
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -387,207 +387,6 @@
                </type>
                <!-- /user group assignment conditions -->
                
-               <!-- pages -->
-               <type>
-                       <name>com.woltlab.wcf.AccountManagementForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\AccountManagementForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.AvatarEditForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\AvatarEditForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.DisclaimerForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\DisclaimerForm]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.EmailActivationForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\EmailActivationForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.EmailNewActivationCodeForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\EmailNewActivationCodeForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.LoginForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\LoginForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.LostPasswordForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\LostPasswordForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.MailForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\MailForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.ModerationActivationForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\ModerationActivationForm]]></classname>
-                       <categoryname>com.woltlab.wcf.moderation</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.ModerationReportForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\ModerationReportForm]]></classname>
-                       <categoryname>com.woltlab.wcf.moderation</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.NewPasswordForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\NewPasswordForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.NotificationSettingsForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\NotificationSettingsForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.RegisterActivationForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\RegisterActivationForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.RegisterForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\RegisterForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.RegisterNewActivationCodeForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\RegisterNewActivationCodeForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.SearchForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\SearchForm]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.SettingsForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\SettingsForm]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.SignatureEditForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\SignatureEditForm]]></classname>
-                       <options>module_user_signature</options>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.UserSearchForm</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\form\UserSearchForm]]></classname>
-                       <options>module_members_list</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.DeletedContentListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\DeletedContentListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.moderation</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.FollowingPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\FollowingPage]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.IgnoredUsersPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\IgnoredUsersPage]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.MembersListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\MembersListPage]]></classname>
-                       <options>module_members_list</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.ModerationListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\ModerationListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.moderation</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.NotificationListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\NotificationListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.PaidSubscriptionListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\PaidSubscriptionListPage]]></classname>
-                       <options>module_paid_subscription</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.RecentActivityListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\RecentActivityListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.SearchResultPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\SearchResultPage]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.TaggedPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\TaggedPage]]></classname>
-                       <options>module_tagging</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.TeamPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\TeamPage]]></classname>
-                       <options>module_team_page</options>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.UserPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\UserPage]]></classname>
-                       <categoryname>com.woltlab.wcf.user</categoryname>
-               </type>
-               <type>
-                       <name>com.woltlab.wcf.UsersOnlineListPage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\UsersOnlineListPage]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <!-- /pages -->
-               
                <!-- notice conditions -->
                <type>
                        <name>com.woltlab.wcf.page</name>

diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml
index 4dc1a6b34028588cb78cfa1069ecc192d0e001f0..26c32bbeef2056ded4abeed5c5c642f131a8ed56 100644 (file)
--- a/com.woltlab.wcf/objectTypeDefinition.xml
+++ b/com.woltlab.wcf/objectTypeDefinition.xml
@@ -145,10 +145,6 @@
                        <interfacename><![CDATA[wcf\system\condition\IUserCondition]]></interfacename>
                </definition>
                
-               <definition>
-                       <name>com.woltlab.wcf.page</name>
-               </definition>
-               
                <definition>
                        <name>com.woltlab.wcf.condition.notice</name>
                        <interfacename><![CDATA[wcf\system\condition\IContentCondition]]></interfacename>
@@ -213,6 +209,10 @@
                </definition>
                
                <!-- deprecated -->
+               <definition>
+                       <name>com.woltlab.wcf.page</name>
+               </definition>
+               
                <definition>
                        <name>com.woltlab.wcf.user.online.location</name>
                        <interfacename><![CDATA[wcf\system\user\online\location\IUserOnlineLocation]]></interfacename>

diff --git a/wcfsetup/install/files/lib/system/option/PageMultiSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/PageMultiSelectOptionType.class.php
deleted file mode 100644 (file)
index b711dc8..0000000
--- a/wcfsetup/install/files/lib/system/option/PageMultiSelectOptionType.class.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-namespace wcf\system\option;
-use wcf\data\option\Option;
-use wcf\system\page\PageManager;
-
-/**
- * Option type implementation for selecting multiple pages.
- * 
- * @author     Matthias Schmidt
- * @copyright  2001-2016 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage system.option
- * @category   Community Framework
- */
-class PageMultiSelectOptionType extends MultiSelectOptionType {
-       /**
-        * @inheritDoc
-        */
-       protected function getSelectOptions(Option $option) {
-               return PageManager::getInstance()->getSelection($option->application);
-       }
-}

diff --git a/wcfsetup/install/files/lib/system/option/PageSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/PageSelectOptionType.class.php
deleted file mode 100644 (file)
index 31b67e6..0000000
--- a/wcfsetup/install/files/lib/system/option/PageSelectOptionType.class.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-namespace wcf\system\option;
-use wcf\data\option\Option;
-use wcf\system\page\PageManager;
-
-/**
- * Option type implementation for selecting pages.
- * 
- * @author     Matthias Schmidt
- * @copyright  2001-2016 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage system.option
- * @category   Community Framework
- */
-class PageSelectOptionType extends SelectOptionType {
-       /**
-        * @inheritDoc
-        */
-       protected function getSelectOptions(Option $option) {
-               return PageManager::getInstance()->getSelection($option->application);
-       }
-}

diff --git a/wcfsetup/install/files/lib/system/page/PageManager.class.php b/wcfsetup/install/files/lib/system/page/PageManager.class.php
deleted file mode 100644 (file)
index fd90f81..0000000
--- a/wcfsetup/install/files/lib/system/page/PageManager.class.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-namespace wcf\system\page;
-use wcf\data\object\type\ObjectType;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\system\application\ApplicationHandler;
-use wcf\system\exception\SystemException;
-use wcf\system\SingletonFactory;
-use wcf\system\WCF;
-
-/**
- * Manages the available page object types.
- * 
- * @author     Matthias Schmidt
- * @copyright  2001-2016 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage system.page
- * @category   Community Framework
- */
-class PageManager extends SingletonFactory {
-       /**
-        * list of available page object types
-        * @var ObjectType[]
-        */
-       protected $objectTypes = [];
-       
-       /**
-        * @inheritDoc
-        */
-       protected function init() {
-               $this->objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.page');
-       }
-       
-       /**
-        * Returns a list of the available page object types.
-        * 
-        * @return      ObjectType[]
-        */
-       public function getObjectTypes() {
-               return $this->objectTypes;
-       }
-       
-       /**
-        * Returns an array used to build a page selection. If $application is given,
-        * only pages who belong to the application with the given abbreviation
-        * are returned.
-        * 
-        * @param       string          $application
-        * @return      string[]
-        * @throws      SystemException
-        */
-       public function getSelection($application = null) {
-               $objectTypes = $this->objectTypes;
-               
-               // filter by application
-               if ($application !== null) {
-                       // validate application
-                       if ($application != 'wcf' && ApplicationHandler::getInstance()->getApplication($application) === null) {
-                               throw new SystemException("Unknown application with abbreviation '".$application."'");
-                       }
-                       
-                       foreach ($objectTypes as $objectTypeName => $objectType) {
-                               $classNamePieces = explode('\\', $objectType->className);
-                               
-                               if ($classNamePieces[0] != $application) {
-                                       unset($objectTypes[$objectTypeName]);
-                               }
-                       }
-               }
-               
-               // filter by options
-               foreach ($objectTypes as $objectTypeName => $objectType) {
-                       if (!$objectType->validateOptions()) {
-                               unset($objectTypes[$objectTypeName]);
-                       }
-               }
-               
-               $selection = [];
-               foreach ($objectTypes as $objectType) {
-                       $categoryName = WCF::getLanguage()->get('wcf.page.category.'.$objectType->categoryname);
-                       if (!isset($selection[$categoryName])) {
-                               $selection[$categoryName] = [];
-                       }
-                       
-                       $selection[$categoryName][$objectType->objectTypeID] = WCF::getLanguage()->get('wcf.page.'.$objectType->objectType);
-               }
-               
-               ksort($selection);
-               
-               foreach ($selection as &$subSelection) {
-                       asort($subSelection);
-               }
-               
-               return $selection;
-       }
-}

diff --git a/wcfsetup/install/files/lib/system/user/online/location/UserLocation.class.php b/wcfsetup/install/files/lib/system/user/online/location/UserLocation.class.php
deleted file mode 100644 (file)
index da7897d..0000000
--- a/wcfsetup/install/files/lib/system/user/online/location/UserLocation.class.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-namespace wcf\system\user\online\location;
-use wcf\data\user\online\UserOnline;
-use wcf\data\user\User;
-use wcf\data\user\UserList;
-use wcf\system\WCF;
-
-/**
- * Implementation of IUserOnlineLocation for the user profile location.
- * 
- * @author     Marcel Werk
- * @copyright  2001-2016 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage system.user.online.location
- * @category   Community Framework
- * @deprecated since 2.2
- */
-class UserLocation implements IUserOnlineLocation {
-       /**
-        * user ids
-        * @var integer[]
-        */
-       protected $userIDs = [];
-       
-       /**
-        * list of users
-        * @var User[]
-        */
-       protected $users = null;
-       
-       /**
-        * @inheritDoc
-        */
-       public function cache(UserOnline $user) {
-               if ($user->objectID) $this->userIDs[] = $user->objectID;
-       }
-       
-       /**
-        * @inheritDoc
-        */
-       public function get(UserOnline $user, $languageVariable = '') {
-               if ($this->users === null) {
-                       $this->readUsers();
-               }
-               
-               if (!isset($this->users[$user->objectID])) {
-                       return '';
-               }
-               
-               return WCF::getLanguage()->getDynamicVariable($languageVariable, ['user' => $this->users[$user->objectID]]);
-       }
-       
-       /**
-        * Loads the users.
-        */
-       protected function readUsers() {
-               $this->users = [];
-               
-               if (empty($this->userIDs)) return;
-               $this->userIDs = array_unique($this->userIDs);
-               
-               $userList = new UserList();
-               $userList->setObjectIDs($this->userIDs);
-               $userList->readObjects();
-               $this->users = $userList->getObjects();
-       }
-}

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index dc1cbfb7f4f63dd675bf9ad048aca8cca9c6a10c..b7bfc0c605c789f5451323d3bdf4346252de34bf 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2507,9 +2507,6 @@ Fehler sind beispielsweise:
                <item name="wcf.page.javascriptDisabled"><![CDATA[In Ihrem Webbrowser ist JavaScript deaktiviert. Um alle Funktionen dieser Website nutzen zu können, muss JavaScript aktiviert sein.]]></item>
                <item name="wcf.page.requestedPage"><![CDATA[Aufgerufene Seite]]></item>
                <item name="wcf.page.cookiePolicy.info"><![CDATA[Diese Seite verwendet Cookies. Durch die Nutzung unserer Seite erklären Sie sich damit einverstanden, dass wir Cookies setzen. <a href="{page}com.woltlab.wcf.CookiePolicy{/page}">Weitere Informationen</a>]]></item>
-               <item name="wcf.page.category.com.woltlab.wcf.moderation"><![CDATA[Moderation]]></item>
-               <item name="wcf.page.category.com.woltlab.wcf.other"><![CDATA[Weitere Seiten]]></item>
-               <item name="wcf.page.category.com.woltlab.wcf.user"><![CDATA[Benutzer]]></item>
                <item name="wcf.page.comments"><![CDATA[Kommentare]]></item>
                
                <item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[Benutzerprofil von <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 7ee57538f486bfc4586c57069c9124ce67b7d2a3..bd6a2e1bbdd1914a0dde1a2461fa8b7433bab50d 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2545,9 +2545,6 @@ Errors are:
                <item name="wcf.page.javascriptDisabled"><![CDATA[Your browser has JavaScript disabled. If you would like to use all features of this site, it is mandatory to enable JavaScript.]]></item>
                <item name="wcf.page.requestedPage"><![CDATA[Requested Page]]></item>
                <item name="wcf.page.cookiePolicy.info"><![CDATA[This site uses cookies. By continuing to browse this site, you are agreeing to our use of cookies. <a href="{page}com.woltlab.wcf.CookiePolicy{/page}">More details</a>]]></item>
-               <item name="wcf.page.category.com.woltlab.wcf.moderation"><![CDATA[Moderation]]></item>
-               <item name="wcf.page.category.com.woltlab.wcf.other"><![CDATA[Other Pages]]></item>
-               <item name="wcf.page.category.com.woltlab.wcf.user"><![CDATA[Users]]></item>
                <item name="wcf.page.comments"><![CDATA[Comments]]></item>
                
                <item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[User profile of <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>