Update PIP XML files based on PIP GUI formatting

See WoltLab/WCF#2545

diff --git a/clipboardAction.xml b/clipboardAction.xml
index 4ef07f3f9343d03fc295fb47ad62b5a191d17e33..6c64094de19e3ba747b3d1427ab796a0dfd78461 100644 (file)
--- a/clipboardAction.xml
+++ b/clipboardAction.xml
@@ -51,6 +51,5 @@
                                <page>wcf\page\ConversationListPage</page>
                        </pages>
                </action>
-               <!-- /conversation -->
        </import>
 </data>

diff --git a/eventListener.xml b/eventListener.xml
index f099c884a0d6a2eaf86d264f9298172827876aa1..0b755349a42767b53d8eece9a9e9d007ec38f8cd 100644 (file)
--- a/eventListener.xml
+++ b/eventListener.xml
@@ -7,12 +7,10 @@
                        <listenerclassname>wcf\system\event\listener\ConversationUserMergeListener</listenerclassname>
                        <environment>admin</environment>
                </eventlistener>
-               
                <eventlistener name="userRenameUser">
                        <eventclassname>wcf\data\user\UserAction</eventclassname>
                        <eventname>rename</eventname>
                        <listenerclassname>wcf\system\event\listener\ConversationUserActionRenameListener</listenerclassname>
-                       <environment>user</environment>
                </eventlistener>
                <eventlistener name="userRenameAdmin">
                        <eventclassname>wcf\data\user\UserAction</eventclassname>

diff --git a/language/de.xml b/language/de.xml
index 638dcfa81cfeaa4eebd4a9a3eaee1011b247ed2a..41d6ad32fcd0c58bfbd819dd4ead8c2b88c8f0d0 100644 (file)
--- a/language/de.xml
+++ b/language/de.xml
@@ -22,35 +22,31 @@
                <item name="wcf.acp.group.option.user.conversation.allowedAttachmentExtensions"><![CDATA[Erlaubte Dateiendungen]]></item>
                <item name="wcf.acp.group.option.user.conversation.allowedAttachmentExtensions.description"><![CDATA[Eine Dateiendung pro Zeile]]></item>
                <item name="wcf.acp.group.option.user.conversation.maxAttachmentCount"><![CDATA[Maximale Dateianhänge pro Nachricht]]></item>
-               <item name="wcf.acp.group.option.user.conversation.maxAttachmentCount.description"><![CDATA[]]></item>
+               <item name="wcf.acp.group.option.user.conversation.maxAttachmentCount.description"/>
                <item name="wcf.acp.group.option.user.conversation.canEditMessage"><![CDATA[Kann eigene Nachrichten bearbeiten]]></item>
                <item name="wcf.acp.group.option.user.conversation.canEditMessage.description"><![CDATA[Mitglieder dieser Benutzergruppe können eigene Nachrichten in Konversationen nachträglich verändern, auch wenn diese bereits vom Empfänger gelesen wurden.]]></item>
        </category>
-       
        <category name="wcf.acp.option">
                <item name="wcf.acp.option.category.message.conversation"><![CDATA[Konversationen]]></item>
                <item name="wcf.acp.option.conversation_list_default_sort_field"><![CDATA[Sortierung]]></item>
-               <item name="wcf.acp.option.conversation_list_default_sort_field.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.conversation_list_default_sort_field.description"/>
                <item name="wcf.acp.option.conversation_list_default_sort_order"><![CDATA[Reihenfolge]]></item>
-               <item name="wcf.acp.option.conversation_list_default_sort_order.description"><![CDATA[]]></item>
+               <item name="wcf.acp.option.conversation_list_default_sort_order.description"/>
                <item name="wcf.acp.option.conversation_messages_per_page"><![CDATA[Nachrichten pro Seite]]></item>
                <item name="wcf.acp.option.conversations_per_page"><![CDATA[Konversationen pro Seite]]></item>
                <item name="wcf.acp.option.module_conversation"><![CDATA[Konversationen]]></item>
        </category>
-       
        <category name="wcf.acp.rebuildData">
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.conversation"><![CDATA[Konversationen aktualisieren]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.conversation.description"><![CDATA[Aktualisiert Zähler der Konversationen]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.conversation.message"><![CDATA[Konversationsnachrichten aktualisieren]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.conversation.message.description"><![CDATA[Aktualisiert den Suchindex für Konversationsnachrichten]]></item>
        </category>
-       
        <category name="wcf.acp.stat">
                <item name="wcf.acp.stat.com.woltlab.wcf.conversation"><![CDATA[Konversationen]]></item>
                <item name="wcf.acp.stat.com.woltlab.wcf.conversation.message"><![CDATA[Konversations-Nachrichten]]></item>
                <item name="wcf.acp.stat.category.com.woltlab.wcf.conversation"><![CDATA[Konversationen]]></item>
        </category>
-       
        <category name="wcf.clipboard">
                <item name="wcf.clipboard.item.com.woltlab.wcf.conversation.conversation.assignLabel"><![CDATA[Label zuweisen ({#$count})]]></item>
                <item name="wcf.clipboard.item.com.woltlab.wcf.conversation.conversation.close"><![CDATA[Schließen ({#$count})]]></item>
@@ -62,7 +58,6 @@
                <item name="wcf.clipboard.item.com.woltlab.wcf.conversation.conversation.restore"><![CDATA[Als aktiv markieren ({#$count})]]></item>
                <item name="wcf.clipboard.label.com.woltlab.wcf.conversation.conversation.marked"><![CDATA[{if $count == 1}Eine Konversation{else}{#$count} Konversationen{/if}]]></item>
        </category>
-       
        <category name="wcf.conversation">
                <item name="wcf.conversation.add"><![CDATA[Neue Konversation starten]]></item>
                <item name="wcf.conversation.button.add"><![CDATA[Konversation starten]]></item>
@@ -94,7 +89,7 @@
                <item name="wcf.conversation.noMoreItems"><![CDATA[Keine aktuellen Konversationen]]></item>
                <item name="wcf.conversation.participantCanInvite"><![CDATA[Teilnehmer können weitere Teilnehmer hinzufügen]]></item>
                <item name="wcf.conversation.participants"><![CDATA[Teilnehmer]]></item>
-               <item name="wcf.conversation.participants.description"><![CDATA[]]></item>
+               <item name="wcf.conversation.participants.description"/>
                <item name="wcf.conversation.participants.error.mailboxIsFull"><![CDATA[{$errorData[username]} hat das zulässige Limit für Konversationen bereits erreicht und kann an keinen neuen Konversationen teilnehmen.]]></item>
                <item name="wcf.conversation.participants.error.notFound"><![CDATA[Der Benutzername {$errorData[username]} konnte nicht gefunden werden.]]></item>
                <item name="wcf.conversation.participants.error.isAuthor"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du bist{else}Sie sind{/if} bereits Teilnehmer dieser Konversation.]]></item>
@@ -133,7 +128,6 @@
                <item name="wcf.conversation.visibility.new.description"><![CDATA[Die neuen Teilnehmer sehen nur neue Nachrichten, alle vorherigen Nachrichten werden nicht angezeigt.]]></item>
                <item name="wcf.conversation.visibility.previousMessages"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du wurdest{else}Sie wurden{/if} einer laufenden Konversation hinzugefügt, vorherige Nachrichten werden {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if} nicht angezeigt.]]></item>
        </category>
-       
        <category name="wcf.conversation.edit">
                <item name="wcf.conversation.edit.addParticipants"><![CDATA[Teilnehmer hinzufügen]]></item>
                <item name="wcf.conversation.edit.addParticipants.success"><![CDATA[{if $count == 1}Ein{else}{#$count}{/if} Teilnehmer erfolgreich hinzugefügt]]></item>
@@ -143,7 +137,6 @@
                <item name="wcf.conversation.edit.open"><![CDATA[Öffnen]]></item>
                <item name="wcf.conversation.edit.subject"><![CDATA[Betreff bearbeiten]]></item>
        </category>
-       
        <category name="wcf.conversation.label">
                <item name="wcf.conversation.label"><![CDATA[Filter nach Label]]></item>
                <item name="wcf.conversation.label.cssClassName"><![CDATA[Aussehen]]></item>
@@ -161,7 +154,6 @@
                <item name="wcf.conversation.label.placeholder"><![CDATA[Label]]></item>
                <item name="wcf.conversation.label.assignLabels"><![CDATA[Label zuweisen]]></item>
        </category>
-       
        <category name="wcf.conversation.log">
                <item name="wcf.conversation.log.conversation.open"><![CDATA[Hat die Konversation wieder geöffnet.]]></item>
                <item name="wcf.conversation.log.conversation.close"><![CDATA[Hat die Konversation für neue Nachrichten geschlossen.]]></item>
@@ -169,7 +161,6 @@
                <item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Hat folgende Teilnehmer hinzugefügt: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-user-id="{@$participant[userID]}">{$participant[username]}</a>{/implode}]]></item>
                <item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Hat folgende Teilnehmer entfernt: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-user-id="{@$additionalData[userID]}">{$additionalData[username]}</a>]]></item>
        </category>
-       
        <category name="wcf.acp.dataImport">
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation"><![CDATA[Konversationen]]></item>
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation.label"><![CDATA[Labels]]></item>
@@ -177,21 +168,17 @@
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation.user"><![CDATA[Teilnehmer]]></item>
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation.attachment"><![CDATA[Dateianhänge]]></item>
        </category>
-       
        <category name="wcf.moderation">
                <item name="wcf.moderation.type.com.woltlab.wcf.conversation.message"><![CDATA[Konversation]]></item>
        </category>
-       
        <category name="wcf.page">
                <item name="wcf.page.onlineLocation.com.woltlab.wcf.conversation.Conversation"><![CDATA[Konversation <a href="{link controller='Conversation' object=$conversation}{/link}" class="conversationLink" data-conversation-id="{@$conversation->conversationID}">{$conversation->subject}</a>]]></item>
        </category>
-       
        <category name="wcf.search">
                <item name="wcf.search.type.com.woltlab.wcf.conversation"><![CDATA[Diese Konversation]]></item>
                <item name="wcf.search.type.com.woltlab.wcf.conversation.message"><![CDATA[Konversationen]]></item>
                <item name="wcf.search.object.com.woltlab.wcf.conversation.message"><![CDATA[Konversation]]></item>
        </category>
-       
        <category name="wcf.user.notification">
                <item name="wcf.user.notification.conversation.message.message"><![CDATA[{@$author->getAnchorTag()} hat auf die Konversation <a href="{link controller='Conversation' object=$message->getConversation()}{/link}">{$message->getConversation()->getTitle()}</a> geantwortet.]]></item>
                <item name="wcf.user.notification.conversation.message.message.stacked"><![CDATA[{if $count < 4}{@$authors[0]->getAnchorTag()}{if $count == 2} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} und {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} und {#$count} weitere{/if} haben auf die Konversation <a href="{link controller='Conversation' object=$message->getConversation()}{/link}">{$message->getConversation()->getTitle()}</a> geantwortet.]]></item>
@@ -207,7 +194,6 @@
                <item name="wcf.user.notification.com.woltlab.wcf.conversation.notification.conversation"><![CDATA[Neue Konversation]]></item>
                <item name="wcf.user.notification.com.woltlab.wcf.conversation.message.notification.conversationMessage"><![CDATA[Antwort auf bestehende Konversation]]></item>
        </category>
-       
        <category name="wcf.user.option">
                <item name="wcf.user.option.conversationMessagesPerPage"><![CDATA[Nachrichten pro Seite]]></item>
                <item name="wcf.user.option.conversationsPerPage"><![CDATA[Konversationen pro Seite]]></item>

diff --git a/language/en.xml b/language/en.xml
index b25f6efdcf25693f0023688a1303ffac11b6e0c6..29f04c98b4e8550babe9719ceef8ce17204a7290 100644 (file)
--- a/language/en.xml
+++ b/language/en.xml
@@ -26,7 +26,6 @@
                <item name="wcf.acp.group.option.user.conversation.canEditMessage"><![CDATA[Can edit their messages]]></item>
                <item name="wcf.acp.group.option.user.conversation.canEditMessage.description"><![CDATA[Users can edit their messages, regardless if they have been read by one or more recipients.]]></item>
        </category>
-       
        <category name="wcf.acp.option">
                <item name="wcf.acp.option.category.message.conversation"><![CDATA[Conversations]]></item>
                <item name="wcf.acp.option.conversation_list_default_sort_field"><![CDATA[Sort by]]></item>
@@ -37,20 +36,17 @@
                <item name="wcf.acp.option.conversations_per_page"><![CDATA[Conversations per Page]]></item>
                <item name="wcf.acp.option.module_conversation"><![CDATA[Conversations]]></item>
        </category>
-       
        <category name="wcf.acp.rebuildData">
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.conversation"><![CDATA[Rebuild Conversations]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.conversation.description"><![CDATA[Rebuilds the conversation counters.]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.conversation.message"><![CDATA[Rebuild Conversation Messages]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.conversation.message.description"><![CDATA[Rebuilds the search index for the conversation messages.]]></item>
        </category>
-       
        <category name="wcf.acp.stat">
                <item name="wcf.acp.stat.com.woltlab.wcf.conversation"><![CDATA[Conversations]]></item>
                <item name="wcf.acp.stat.com.woltlab.wcf.conversation.message"><![CDATA[Conversation Messages]]></item>
                <item name="wcf.acp.stat.category.com.woltlab.wcf.conversation"><![CDATA[Conversations]]></item>
        </category>
-       
        <category name="wcf.clipboard">
                <item name="wcf.clipboard.item.com.woltlab.wcf.conversation.conversation.assignLabel"><![CDATA[Assign Label ({#$count})]]></item>
                <item name="wcf.clipboard.item.com.woltlab.wcf.conversation.conversation.close"><![CDATA[Close ({#$count})]]></item>
@@ -62,7 +58,6 @@
                <item name="wcf.clipboard.item.com.woltlab.wcf.conversation.conversation.restore"><![CDATA[Mark as Active ({#$count})]]></item>
                <item name="wcf.clipboard.label.com.woltlab.wcf.conversation.conversation.marked"><![CDATA[{if $count == 1}One Conversation{else}{#$count} Conversations{/if}]]></item>
        </category>
-       
        <category name="wcf.conversation">
                <item name="wcf.conversation.add"><![CDATA[Create Conversation]]></item>
                <item name="wcf.conversation.button.add"><![CDATA[Create Conversation]]></item>
@@ -94,7 +89,7 @@
                <item name="wcf.conversation.noMoreItems"><![CDATA[You have no recent conversations.]]></item>
                <item name="wcf.conversation.participantCanInvite"><![CDATA[Participants can add new participants]]></item>
                <item name="wcf.conversation.participants"><![CDATA[Participants]]></item>
-               <item name="wcf.conversation.participants.description"><![CDATA[]]></item>
+               <item name="wcf.conversation.participants.description"/>
                <item name="wcf.conversation.participants.description"><![CDATA[Separate multiple users with a comma.]]></item>
                <item name="wcf.conversation.participants.error.mailboxIsFull"><![CDATA[{$errorData[username]} is already participating in too many conversations and cannot be added.]]></item>
                <item name="wcf.conversation.participants.error.notFound"><![CDATA[The username “{$errorData[username]}” does not exist.]]></item>
@@ -134,7 +129,6 @@
                <item name="wcf.conversation.visibility.new.description"><![CDATA[The new participants will see new messages only, older messages will be hidden from them.]]></item>
                <item name="wcf.conversation.visibility.previousMessages"><![CDATA[You have been added to an existing conversation, previously written messages are hidden.]]></item>
        </category>
-       
        <category name="wcf.conversation.edit">
                <item name="wcf.conversation.edit.addParticipants"><![CDATA[Add Participants]]></item>
                <item name="wcf.conversation.edit.addParticipants.success"><![CDATA[Added {#$count} participant{if $count != 1}s{/if}]]></item>
@@ -144,7 +138,6 @@
                <item name="wcf.conversation.edit.open"><![CDATA[Open]]></item>
                <item name="wcf.conversation.edit.subject"><![CDATA[Edit Subject]]></item>
        </category>
-       
        <category name="wcf.conversation.label">
                <item name="wcf.conversation.label"><![CDATA[Filter by Label]]></item>
                <item name="wcf.conversation.label.cssClassName"><![CDATA[Appearance]]></item>
@@ -162,7 +155,6 @@
                <item name="wcf.conversation.label.placeholder"><![CDATA[Label]]></item>
                <item name="wcf.conversation.label.assignLabels"><![CDATA[Assign Label]]></item>
        </category>
-       
        <category name="wcf.conversation.log">
                <item name="wcf.conversation.log.conversation.open"><![CDATA[Opened the conversation again.]]></item>
                <item name="wcf.conversation.log.conversation.close"><![CDATA[Closed the conversation.]]></item>
@@ -170,7 +162,6 @@
                <item name="wcf.conversation.log.conversation.addParticipants"><![CDATA[Added the following participants: {implode from=$additionalData[participants] item=participant}<a href="{link controller='User' id=$participant[userID] title=$participant[username]}{/link}" class="userLink" data-user-id="{@$participant[userID]}">{$participant[username]}</a>{/implode}.]]></item>
                <item name="wcf.conversation.log.conversation.removeParticipant"><![CDATA[Removed a participant: <a href="{link controller='User' id=$additionalData[userID] title=$additionalData[username]}{/link}" class="userLink" data-user-id="{@$additionalData[userID]}">{$additionalData[username]}</a>.]]></item>
        </category>
-       
        <category name="wcf.acp.dataImport">
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation"><![CDATA[Conversations]]></item>
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation.label"><![CDATA[Labels]]></item>
@@ -178,21 +169,17 @@
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation.user"><![CDATA[Participants]]></item>
                <item name="wcf.acp.dataImport.data.com.woltlab.wcf.conversation.attachment"><![CDATA[Attachments]]></item>
        </category>
-       
        <category name="wcf.moderation">
                <item name="wcf.moderation.type.com.woltlab.wcf.conversation.message"><![CDATA[Conversation]]></item>
        </category>
-       
        <category name="wcf.page">
                <item name="wcf.page.onlineLocation.com.woltlab.wcf.conversation.Conversation"><![CDATA[Conversation <a href="{link controller='Conversation' object=$conversation}{/link}" class="conversationLink" data-conversation-id="{@$conversation->conversationID}">{$conversation->subject}</a>]]></item>
        </category>
-       
        <category name="wcf.search">
                <item name="wcf.search.type.com.woltlab.wcf.conversation"><![CDATA[This Conversation]]></item>
                <item name="wcf.search.type.com.woltlab.wcf.conversation.message"><![CDATA[Conversations]]></item>
                <item name="wcf.search.object.com.woltlab.wcf.conversation.message"><![CDATA[Conversation]]></item>
        </category>
-       
        <category name="wcf.user.notification">
                <item name="wcf.user.notification.conversation.message.message"><![CDATA[{@$author->getAnchorTag()} replied to the conversation <a href="{link controller='Conversation' object=$message->getConversation()}{/link}">{$message->getConversation()->getTitle()}</a>.]]></item>
                <item name="wcf.user.notification.conversation.message.message.stacked"><![CDATA[{if $count < 4}{@$authors[0]->getAnchorTag()}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$count} others{/if} replied to the conversation <a href="{link controller='Conversation' object=$message->getConversation()}{/link}">{$message->getConversation()->getTitle()}</a>.]]></item>
@@ -208,7 +195,6 @@
                <item name="wcf.user.notification.com.woltlab.wcf.conversation.notification.conversation"><![CDATA[Notify me of new conversations]]></item>
                <item name="wcf.user.notification.com.woltlab.wcf.conversation.message.notification.conversationMessage"><![CDATA[Notify me of new replies in conversations]]></item>
        </category>
-       
        <category name="wcf.user.option">
                <item name="wcf.user.option.conversationMessagesPerPage"><![CDATA[Messages per Page]]></item>
                <item name="wcf.user.option.conversationsPerPage"><![CDATA[Conversations per Page]]></item>

diff --git a/objectType.xml b/objectType.xml
index 7809bf8310a0e615b60346fc86330ac2dd50bcf5..adf265c94341f5713c5a6784c1b132ba3cb78d55 100644 (file)
--- a/objectType.xml
+++ b/objectType.xml
@@ -7,25 +7,21 @@
                        <classname>wcf\system\search\ConversationMessageSearch</classname>
                        <searchindex>wcf1_conversation_message_search_index</searchindex>
                </type>
-               
                <type>
                        <name>com.woltlab.wcf.conversation.message</name>
                        <definitionname>com.woltlab.wcf.attachment.objectType</definitionname>
                        <classname>wcf\system\attachment\ConversationMessageAttachmentObjectType</classname>
                        <private>1</private>
                </type>
-               
                <type>
                        <name>com.woltlab.wcf.conversation.message</name>
                        <definitionname>com.woltlab.wcf.message</definitionname>
                </type>
-               
                <type>
                        <name>com.woltlab.wcf.conversation.conversation</name>
                        <definitionname>com.woltlab.wcf.clipboardItem</definitionname>
                        <listclassname>wcf\data\conversation\ConversationList</listclassname>
                </type>
-               
                <type>
                        <name>com.woltlab.wcf.conversation.notification</name>
                        <definitionname>com.woltlab.wcf.notification.objectType</definitionname>
@@ -38,19 +34,16 @@
                        <classname>wcf\system\user\notification\object\type\ConversationMessageNotificationObjectType</classname>
                        <category>com.woltlab.wcf.conversation</category>
                </type>
-               
                <type>
                        <name>com.woltlab.wcf.conversation.message</name>
                        <definitionname>com.woltlab.wcf.message.quote</definitionname>
                        <classname>wcf\system\message\quote\ConversationMessageQuoteHandler</classname>
                </type>
-               
                <type>
                        <name>com.woltlab.wcf.conversation.message</name>
                        <definitionname>com.woltlab.wcf.moderation.report</definitionname>
                        <classname>wcf\system\moderation\queue\report\ConversationMessageModerationQueueReportHandler</classname>
                </type>
-               
                <!-- Modification Log -->
                <type>
                        <name>com.woltlab.wcf.conversation.conversation</name>
@@ -58,7 +51,6 @@
                        <classname>wcf\system\log\modification\ConversationModificationLogHandler</classname>
                </type>
                <!-- /Modification Log -->
-               
                <!-- importers -->
                <type>
                        <name>com.woltlab.wcf.conversation</name>
@@ -86,7 +78,6 @@
                        <classname>wcf\system\importer\ConversationAttachmentImporter</classname>
                </type>
                <!-- /importers -->
-               
                <!-- rebuild data workers -->
                <type>
                        <name>com.woltlab.wcf.conversation</name>
@@ -100,7 +91,6 @@
                        <nicevalue>-5</nicevalue>
                </type>
                <!-- /rebuild data workers -->
-               
                <!-- stat handlers -->
                <type>
                        <name>com.woltlab.wcf.conversation</name>
@@ -114,6 +104,5 @@
                        <classname>wcf\system\stat\ConversationMessageStatDailyHandler</classname>
                        <categoryname>com.woltlab.wcf.conversation</categoryname>
                </type>
-               <!-- /stat handlers -->
        </import>
 </data>

diff --git a/option.xml b/option.xml
index d01588eb40f8d387accd95375f15698eb78eb27e..7bf26c0e35df917e548f07fc51a3e15c0df75019 100644 (file)
--- a/option.xml
+++ b/option.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/vortex/option.xsd">
        <import>
                <categories>
@@ -7,14 +7,12 @@
                                <options>module_conversation</options>
                        </category>
                </categories>
-               
                <options>
                        <option name="module_conversation">
                                <categoryname>module.community</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
                        </option>
-                       
                        <option name="conversations_per_page">
                                <categoryname>message.conversation</categoryname>
                                <optiontype>integer</optiontype>
@@ -29,7 +27,6 @@
                                <minvalue>5</minvalue>
                                <maxvalue>40</maxvalue>
                        </option>
-                       
                        <option name="conversation_list_default_sort_field">
                                <categoryname>message.conversation</categoryname>
                                <optiontype>select</optiontype>
@@ -46,4 +43,4 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
                        </option>
                </options>
        </import>
-</data>
\ No newline at end of file
+</data>

diff --git a/page.xml b/page.xml
index 293f0c1853eb8ad243b278c754eda12c346a138d..35778d442ef0ebff4d988d99cac9987ce4415dc6 100644 (file)
--- a/page.xml
+++ b/page.xml
@@ -2,12 +2,11 @@
 <data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/tornado/page.xsd">
        <import>
                <page identifier="com.woltlab.wcf.conversation.ConversationList">
+                       <pageType>system</pageType>
                        <controller>wcf\page\ConversationListPage</controller>
-                       <handler>wcf\system\page\handler\ConversationListPageHandler</handler>
                        <name language="de">Konversationenliste</name>
                        <name language="en">Conversation List</name>
-                       <pageType>system</pageType>
-                       
+                       <handler>wcf\system\page\handler\ConversationListPageHandler</handler>
                        <content language="en">
                                <title>Conversations</title>
                        </content>
@@ -16,23 +15,22 @@
                        </content>
                </page>
                <page identifier="com.woltlab.wcf.conversation.Conversation">
+                       <pageType>system</pageType>
                        <controller>wcf\page\ConversationPage</controller>
-                       <handler>wcf\system\page\handler\DefaultConversationRelatedPageHandler</handler>
                        <name language="de">Konversation</name>
                        <name language="en">Conversation</name>
-                       <pageType>system</pageType>
-                       <requireObjectID>1</requireObjectID>
+                       <handler>wcf\system\page\handler\DefaultConversationRelatedPageHandler</handler>
                        <hasFixedParent>1</hasFixedParent>
                        <parent>com.woltlab.wcf.conversation.ConversationList</parent>
+                       <requireObjectID>1</requireObjectID>
                </page>
                <page identifier="com.woltlab.wcf.conversation.ConversationAdd">
+                       <pageType>system</pageType>
                        <controller>wcf\form\ConversationAddForm</controller>
                        <name language="de">Konversation starten</name>
                        <name language="en">New Conversation</name>
-                       <pageType>system</pageType>
                        <hasFixedParent>1</hasFixedParent>
                        <parent>com.woltlab.wcf.conversation.ConversationList</parent>
-                       
                        <content language="en">
                                <title>New Conversation</title>
                        </content>
@@ -41,14 +39,13 @@
                        </content>
                </page>
                <page identifier="com.woltlab.wcf.conversation.ConversationDraftEdit">
+                       <pageType>system</pageType>
                        <controller>wcf\form\ConversationDraftEditForm</controller>
                        <name language="de">Konversations-Entwurf bearbeiten</name>
                        <name language="en">Edit Conversation Draft</name>
-                       <pageType>system</pageType>
-                       <requireObjectID>1</requireObjectID>
                        <hasFixedParent>1</hasFixedParent>
                        <parent>com.woltlab.wcf.conversation.ConversationList</parent>
-                       
+                       <requireObjectID>1</requireObjectID>
                        <content language="en">
                                <title>Edit Conversation Draft</title>
                        </content>

diff --git a/templateListener.xml b/templateListener.xml
index 4fa732e2367a1ee9c910ece79acfe04d137732eb..975f1c1e9c98d2f9fca05683fe82c4d9b4479fa9 100644 (file)
--- a/templateListener.xml
+++ b/templateListener.xml
@@ -7,35 +7,30 @@
                        <eventname>menuItems</eventname>
                        <templatecode><![CDATA[{include file='__userPanelConversationDropdown'}]]></templatecode>
                </templatelistener>
-               
                <templatelistener name="userInformationButtons">
                        <environment>user</environment>
                        <templatename>userInformationButtons</templatename>
                        <eventname>buttons</eventname>
                        <templatecode><![CDATA[{include file='__userInformationStartConversation'}]]></templatecode>
                </templatelistener>
-               
                <templatelistener name="userButtons">
                        <environment>user</environment>
                        <templatename>user</templatename>
                        <eventname>buttons</eventname>
                        <templatecode><![CDATA[{include file='__userStartConversation'}]]></templatecode>
                </templatelistener>
-               
                <templatelistener name="searchAreaConversationSettings">
                        <environment>user</environment>
                        <templatename>pageHeaderSearch</templatename>
                        <eventname>settings</eventname>
                        <templatecode><![CDATA[{include file='__searchAreaConversationSettings'}]]></templatecode>
                </templatelistener>
-               
                <templatelistener name="userProfileStartConversation">
                        <environment>user</environment>
                        <templatename>user</templatename>
                        <eventname>menuInteraction</eventname>
                        <templatecode><![CDATA[{include file='__userProfileStartConversation'}]]></templatecode>
                </templatelistener>
-               
                <templatelistener name="mobileMenuConversation">
                        <environment>user</environment>
                        <templatename>pageMenuMobile</templatename>

diff --git a/userGroupOption.xml b/userGroupOption.xml
index 2698c37002dfd46951eb750ce6e4ba09371db471..378d2f9701c04ac9d0259ba7e09d37309dfe29bc 100644 (file)
--- a/userGroupOption.xml
+++ b/userGroupOption.xml
@@ -11,27 +11,25 @@
                                <options>module_conversation</options>
                        </category>
                </categories>
-               
                <options>
                        <!-- mod.conversation -->
                        <option name="mod.conversation.canModerateConversation">
                                <categoryname>mod.conversation</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
-                               <admindefaultvalue>1</admindefaultvalue>
                                <options>module_conversation</options>
+                               <admindefaultvalue>1</admindefaultvalue>
                                <usersonly>1</usersonly>
                        </option>
                        <option name="mod.conversation.canAlwaysInviteUsers">
                                <categoryname>mod.conversation</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
-                               <admindefaultvalue>1</admindefaultvalue>
                                <options>module_conversation</options>
+                               <admindefaultvalue>1</admindefaultvalue>
                                <usersonly>1</usersonly>
                        </option>
                        <!-- /mod.conversation -->
-                       
                        <!-- user.conversation -->
                        <option name="user.conversation.canUseConversation">
                                <categoryname>user.conversation</categoryname>
@@ -92,11 +90,10 @@
                                <categoryname>user.conversation</categoryname>
                                <optiontype>integer</optiontype>
                                <defaultvalue>10000</defaultvalue>
-                               <admindefaultvalue>100000</admindefaultvalue>
                                <minvalue>1000</minvalue>
+                               <admindefaultvalue>100000</admindefaultvalue>
                                <usersonly>1</usersonly>
                        </option>
-                       
                        <option name="user.conversation.canUploadAttachment">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>boolean</optiontype>
@@ -124,8 +121,8 @@ zip
 txt
 pdf</defaultvalue>
                                <options>module_attachment</options>
-                               <wildcard>*</wildcard>
                                <usersonly>1</usersonly>
+                               <wildcard>*</wildcard>
                        </option>
                        <option name="user.conversation.maxAttachmentCount">
                                <categoryname>user.conversation</categoryname>
@@ -136,8 +133,6 @@ pdf</defaultvalue>
                                <maxvalue>100</maxvalue>
                                <usersonly>1</usersonly>
                        </option>
-                       <!-- /user.conversation -->
                </options>
        </import>
 </data>
-

diff --git a/userNotificationEvent.xml b/userNotificationEvent.xml
index b4cab952f6ead71d9c260955e48f3d4dde278d9e..aa26aa4d568baf69bd9c2a1eebe49abb8940ab65 100644 (file)
--- a/userNotificationEvent.xml
+++ b/userNotificationEvent.xml
@@ -7,7 +7,6 @@
                        <classname>wcf\system\user\notification\event\ConversationUserNotificationEvent</classname>
                        <options>module_conversation</options>
                </event>
-               
                <event>
                        <name>conversationMessage</name>
                        <objecttype>com.woltlab.wcf.conversation.message.notification</objecttype>

diff --git a/userOption.xml b/userOption.xml
index 85b1e7f9ca88a2af4c2c11cf1bc2435c3ca7b397..6184ae2ef17450d58f2ba3a9cc1dcdb627579a6c 100644 (file)
--- a/userOption.xml
+++ b/userOption.xml
@@ -1,43 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/vortex/userOption.xsd">
        <import>
                <options>
                        <option name="canSendConversation">
                                <categoryname>settings.privacy.messaging</categoryname>
                                <optiontype>select</optiontype>
-                               <editable>3</editable>
+                               <defaultvalue>0</defaultvalue>
+                               <options>module_conversation</options>
                                <selectoptions>0:wcf.user.access.registered
 1:wcf.user.access.following
 2:wcf.user.access.nobody</selectoptions>
-                               <defaultvalue>0</defaultvalue>
-                               <options>module_conversation</options>
+                               <editable>3</editable>
                        </option>
-                       
                        <option name="conversationsPerPage">
                                <categoryname>settings.general.appearance</categoryname>
                                <optiontype>select</optiontype>
-                               <editable>3</editable>
                                <defaultvalue>0</defaultvalue>
+                               <options>module_conversation</options>
                                <selectoptions>0:wcf.global.defaultValue
 5
 10
 20
 30
 40</selectoptions>
-                               <options>module_conversation</options>
+                               <editable>3</editable>
                        </option>
                        <option name="conversationMessagesPerPage">
                                <categoryname>settings.general.appearance</categoryname>
                                <optiontype>select</optiontype>
-                               <editable>3</editable>
                                <defaultvalue>0</defaultvalue>
+                               <options>module_conversation</options>
                                <selectoptions>0:wcf.global.defaultValue
 5
 10
 20
 30
 40</selectoptions>
-                               <options>module_conversation</options>
+                               <editable>3</editable>
                        </option>
                </options>
        </import>