Fixed pageType/boxType tag

diff --git a/com.woltlab.wcf/page.xml b/com.woltlab.wcf/page.xml
index d0e4b8d163d0e4a9b4f3bc38f58b0a6027acdad6..7cb0b33c7f95f739ebfb832044bd3ffc7bd4688c 100644 (file)
--- a/com.woltlab.wcf/page.xml
+++ b/com.woltlab.wcf/page.xml
@@ -3,7 +3,7 @@
        <import>
                <!-- dynamic -->
                <page identifier="com.woltlab.wcf.Dashboard">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\DashboardPage</controller>
                        <name language="de"><![CDATA[Dashboard]]></name>
                        <name language="en"><![CDATA[Dashboard]]></name>
@@ -11,7 +11,7 @@
                </page>
                
                <page identifier="com.woltlab.wcf.MembersList">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\MembersListPage</controller>
                        <name language="de"><![CDATA[Mitglieder]]></name>
                        <name language="en"><![CDATA[Members]]></name>
@@ -19,14 +19,14 @@
                        <options>module_members_list</options>
                </page>
                <page identifier="com.woltlab.wcf.RecentActivityList">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\RecentActivityListPage</controller>
                        <name language="de"><![CDATA[Letzte Aktivitäten]]></name>
                        <name language="en"><![CDATA[Recent Activities]]></name>
                        <parent>com.woltlab.wcf.MembersList</parent>
                </page>
                <page identifier="com.woltlab.wcf.UsersOnlineList">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\UsersOnlineListPage</controller>
                        <name language="de"><![CDATA[Benutzer Online]]></name>
                        <name language="en"><![CDATA[Users Online]]></name>
@@ -35,7 +35,7 @@
                        <options>module_users_online</options>
                </page>
                <page identifier="com.woltlab.wcf.Team">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\TeamPage</controller>
                        <name language="de"><![CDATA[Team]]></name>
                        <name language="en"><![CDATA[Team]]></name>
@@ -44,7 +44,7 @@
                        <options>module_team_page</options>
                </page>
                <page identifier="com.woltlab.wcf.UserSearch">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\UserSearchForm</controller>
                        <name language="de"><![CDATA[Benutzer suchen]]></name>
                        <name language="en"><![CDATA[Search Users]]></name>
@@ -54,111 +54,111 @@
                </page>
                
                <page identifier="com.woltlab.wcf.AccountManagement">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\AccountManagementForm</controller>
                        <name language="de"><![CDATA[Benutzerkonto-Verwaltung]]></name>
                        <name language="en"><![CDATA[Account Management]]></name>
                </page>
                <page identifier="com.woltlab.wcf.AvatarEdit">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\AvatarEditForm</controller>
                        <name language="de"><![CDATA[Avatar-Verwaltung]]></name>
                        <name language="en"><![CDATA[Avatar Management]]></name>
                </page>
                <page identifier="com.woltlab.wcf.Disclaimer">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\DisclaimerForm</controller>
                        <name language="de"><![CDATA[Disclaimer]]></name>
                        <name language="en"><![CDATA[Disclaimer]]></name>
                </page>
                <page identifier="com.woltlab.wcf.EmailActivation">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\EmailActivationForm</controller>
                        <name language="de"><![CDATA[Aktivierung neuer E-Mail-Adresse]]></name>
                        <name language="en"><![CDATA[New Email Address Verification]]></name>
                </page>
                <page identifier="com.woltlab.wcf.EmailNewActivationCode">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\EmailNewActivationCodeForm</controller>
                        <name language="de"><![CDATA[E-Mail-Aktivierungscode-Anforderung]]></name>
                        <name language="en"><![CDATA[New Email Activation Code Request]]></name>
                </page>
                <page identifier="com.woltlab.wcf.Login">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\LoginForm</controller>
                        <name language="de"><![CDATA[Anmeldung]]></name>
                        <name language="en"><![CDATA[Login]]></name>
                </page>
                <page identifier="com.woltlab.wcf.LostPassword">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\LostPasswordForm</controller>
                        <name language="de"><![CDATA[Kennwort vergessen]]></name>
                        <name language="en"><![CDATA[Lost Password]]></name>
                </page>
                <page identifier="com.woltlab.wcf.Mail">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\MailForm</controller>
                        <name language="de"><![CDATA[E-Mail-Formular]]></name>
                        <name language="en"><![CDATA[Mail Form]]></name>
                </page>
                <page identifier="com.woltlab.wcf.NewPassword">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\NewPasswordForm</controller>
                        <name language="de"><![CDATA[Neues Kennwort]]></name>
                        <name language="en"><![CDATA[New Password Request]]></name>
                </page>
                <page identifier="com.woltlab.wcf.NotificationSettings">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\NotificationSettingsForm</controller>
                        <name language="de"><![CDATA[Benachrichtigungseinstellungen]]></name>
                        <name language="en"><![CDATA[Notification Settings]]></name>
                </page>
                <page identifier="com.woltlab.wcf.RegisterActivation">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\RegisterActivationForm</controller>
                        <name language="de"><![CDATA[Registrierung abschließen]]></name>
                        <name language="en"><![CDATA[Complete Registration]]></name>
                </page>
                <page identifier="com.woltlab.wcf.Register">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\RegisterForm</controller>
                        <name language="de"><![CDATA[Registrierung]]></name>
                        <name language="en"><![CDATA[Registration]]></name>
                </page>
                <page identifier="com.woltlab.wcf.RegisterNewActivationCode">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\RegisterNewActivationCodeForm</controller>
                        <name language="de"><![CDATA[Aktivierungscode-Anforderung]]></name>
                        <name language="en"><![CDATA[New Activation Code Request]]></name>
                </page>
                <page identifier="com.woltlab.wcf.Search">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\SearchForm</controller>
                        <name language="de"><![CDATA[Suche]]></name>
                        <name language="en"><![CDATA[Search]]></name>
                </page>
                <page identifier="com.woltlab.wcf.Settings">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\SettingsForm</controller>
                        <name language="de"><![CDATA[Einstellungen]]></name>
                        <name language="en"><![CDATA[Settings]]></name>
                </page>
                <page identifier="com.woltlab.wcf.SignatureEdit">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\SignatureEditForm</controller>
                        <name language="de"><![CDATA[Signatur-Verwaltung]]></name>
                        <name language="en"><![CDATA[Signature Management]]></name>
                        <options>module_user_signature</options>
                </page>
                <page identifier="com.woltlab.wcf.DeletedContentList">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\DeletedContentListPage</controller>
                        <name language="de"><![CDATA[Gelöschte Inhalte]]></name>
                        <name language="en"><![CDATA[Deleted Content]]></name>
                        <permissions>mod.general.canUseModeration</permissions>
                </page>
                <page identifier="com.woltlab.wcf.EditHistory">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\EditHistoryPage</controller>
                        <name language="de"><![CDATA[TODO]]></name>
                        <name language="en"><![CDATA[TODO]]></name>
@@ -166,26 +166,26 @@
                        <requireObjectID>1</requireObjectID>
                </page>
                <page identifier="com.woltlab.wcf.Following">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\FollowingPage</controller>
                        <name language="de"><![CDATA[Benutzer, denen Sie folgen]]></name>
                        <name language="en"><![CDATA[Followed Users]]></name>
                </page>
                <page identifier="com.woltlab.wcf.IgnoredUsers">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\IgnoredUsersPage</controller>
                        <name language="de"><![CDATA[Blockierte Benutzer]]></name>
                        <name language="en"><![CDATA[Blocked Users]]></name>
                </page>
                <page identifier="com.woltlab.wcf.ModerationList">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\ModerationListPage</controller>
                        <name language="de"><![CDATA[Moderation]]></name>
                        <name language="en"><![CDATA[Moderation]]></name>
                        <permissions>mod.general.canUseModeration</permissions>
                </page>
                <page identifier="com.woltlab.wcf.ModerationActivation">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\ModerationActivationForm</controller>
                        <name language="de"><![CDATA[Inhaltsfreischaltung]]></name>
                        <name language="en"><![CDATA[Content Approval]]></name>
@@ -194,7 +194,7 @@
                        <requireObjectID>1</requireObjectID>
                </page>
                <page identifier="com.woltlab.wcf.ModerationReport">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\form\ModerationReportForm</controller>
                        <name language="de"><![CDATA[Inhaltsmeldung]]></name>
                        <name language="en"><![CDATA[Content Report]]></name>
@@ -203,20 +203,20 @@
                        <requireObjectID>1</requireObjectID>
                </page>
                <page identifier="com.woltlab.wcf.NotificationList">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\NotificationListPage</controller>
                        <name language="de"><![CDATA[Benachrichtigungen]]></name>
                        <name language="en"><![CDATA[Notifications]]></name>
                </page>
                <page identifier="com.woltlab.wcf.PaidSubscriptionList">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\PaidSubscriptionListPage</controller>
                        <name language="de"><![CDATA[Bezahlte Mitgliedschaften]]></name>
                        <name language="en"><![CDATA[Paid Subscriptions]]></name>
                        <options>module_paid_subscription</options>
                </page>
                <page identifier="com.woltlab.wcf.SearchResult">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\SearchResultPage</controller>
                        <name language="de"><![CDATA[Suchergebnisse]]></name>
                        <name language="en"><![CDATA[Search Results]]></name>
@@ -224,7 +224,7 @@
                        <requireObjectID>1</requireObjectID>
                </page>
                <page identifier="com.woltlab.wcf.Tagged">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\TaggedPage</controller>
                        <name language="de"><![CDATA[Inhalte mit bestimmtem Tag]]></name>
                        <name language="en"><![CDATA[Content With Particular Tag]]></name>
@@ -232,7 +232,7 @@
                        <requireObjectID>1</requireObjectID>
                </page>
                <page identifier="com.woltlab.wcf.User">
-                       <pagetype>system</pagetype>
+                       <pageType>system</pageType>
                        <controller>wcf\page\UserPage</controller>
                        <handler>wcf\system\page\handler\UserPageHandler</handler>
                        <name language="de"><![CDATA[Benutzerprofil]]></name>
@@ -243,7 +243,7 @@
                
                <!-- static -->
                <page identifier="com.woltlab.wcf.CookiePolicy">
-                       <pagetype>text</pagetype>
+                       <pageType>text</pageType>
                        <name language="en">Cookie Policy</name>
                        <name language="de">Cookie-Richtlinie</name>
                        
@@ -303,7 +303,7 @@
                </page>
                
                <page identifier="com.woltlab.wcf.PrivacyPolicy">
-                       <pagetype>text</pagetype>
+                       <pageType>text</pageType>
                        <name language="en">Privacy Policy</name>
                        <name language="de">Datenschutzerklärung</name>
                        <options>module_privacy_policy_page</options>

diff --git a/wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php
index 99ddba59b2659c49d1747f2dfdb194f81fd2dd03..07b67f444139d09f676c48cbb438c0e91c963127 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php
@@ -94,7 +94,7 @@ class BoxPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
         * @throws      SystemException
         */
        protected function prepareImport(array $data) {
-               $boxType = $data['elements']['boxtype'];
+               $boxType = $data['elements']['boxType'];
                $className = '';
                $identifier = $data['attributes']['identifier'];
                $isMultilingual = false;

diff --git a/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
index 4ae93ddc868e4195821d22816a9774cb9e1d9d14..cd8bed25b1f1712d31493bfcc7d3453b0095665b 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
@@ -145,7 +145,7 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
                }
                
                // validate page type
-               $pageType = $data['elements']['pagetype'];
+               $pageType = $data['elements']['pageType'];
                $controller = '';
                $identifier = $data['attributes']['identifier'];
                $isMultilingual = 0;