Remove unnecessary CDATA

diff --git a/clipboardAction.xml b/clipboardAction.xml
index 25015b44e5af8e54065e71f3dc869b70d53d9d7f..a541fc7a4a170542327ec7af39b5cf7466d4a93f 100644 (file)
--- a/clipboardAction.xml
+++ b/clipboardAction.xml
@@ -3,52 +3,52 @@
        <import>
                <!-- conversation -->
                <action name="assignLabel">
-                       <actionclassname><![CDATA[wcf\system\clipboard\action\ConversationClipboardAction]]></actionclassname>
+                       <actionclassname>wcf\system\clipboard\action\ConversationClipboardAction</actionclassname>
                        <showorder>1</showorder>
                        <pages>
-                               <page><![CDATA[wcf\page\ConversationListPage]]></page>
+                               <page>wcf\page\ConversationListPage</page>
                        </pages>
                </action>
                <action name="markAsRead">
-                       <actionclassname><![CDATA[wcf\system\clipboard\action\ConversationClipboardAction]]></actionclassname>
+                       <actionclassname>wcf\system\clipboard\action\ConversationClipboardAction</actionclassname>
                        <showorder>2</showorder>
                        <pages>
-                               <page><![CDATA[wcf\page\ConversationListPage]]></page>
+                               <page>wcf\page\ConversationListPage</page>
                        </pages>
                </action>
                <action name="restore">
-                       <actionclassname><![CDATA[wcf\system\clipboard\action\ConversationClipboardAction]]></actionclassname>
+                       <actionclassname>wcf\system\clipboard\action\ConversationClipboardAction</actionclassname>
                        <showorder>3</showorder>
                        <pages>
-                               <page><![CDATA[wcf\page\ConversationListPage]]></page>
+                               <page>wcf\page\ConversationListPage</page>
                        </pages>
                </action>
                <action name="leave">
-                       <actionclassname><![CDATA[wcf\system\clipboard\action\ConversationClipboardAction]]></actionclassname>
+                       <actionclassname>wcf\system\clipboard\action\ConversationClipboardAction</actionclassname>
                        <showorder>4</showorder>
                        <pages>
-                               <page><![CDATA[wcf\page\ConversationListPage]]></page>
+                               <page>wcf\page\ConversationListPage</page>
                        </pages>
                </action>
                <action name="leavePermanently">
-                       <actionclassname><![CDATA[wcf\system\clipboard\action\ConversationClipboardAction]]></actionclassname>
+                       <actionclassname>wcf\system\clipboard\action\ConversationClipboardAction</actionclassname>
                        <showorder>5</showorder>
                        <pages>
-                               <page><![CDATA[wcf\page\ConversationListPage]]></page>
+                               <page>wcf\page\ConversationListPage</page>
                        </pages>
                </action>
                <action name="open">
-                       <actionclassname><![CDATA[wcf\system\clipboard\action\ConversationClipboardAction]]></actionclassname>
+                       <actionclassname>wcf\system\clipboard\action\ConversationClipboardAction</actionclassname>
                        <showorder>6</showorder>
                        <pages>
-                               <page><![CDATA[wcf\page\ConversationListPage]]></page>
+                               <page>wcf\page\ConversationListPage</page>
                        </pages>
                </action>
                <action name="close">
-                       <actionclassname><![CDATA[wcf\system\clipboard\action\ConversationClipboardAction]]></actionclassname>
+                       <actionclassname>wcf\system\clipboard\action\ConversationClipboardAction</actionclassname>
                        <showorder>7</showorder>
                        <pages>
-                               <page><![CDATA[wcf\page\ConversationListPage]]></page>
+                               <page>wcf\page\ConversationListPage</page>
                        </pages>
                </action>
                <!-- /conversation -->

diff --git a/coreObject.xml b/coreObject.xml
index 371330d509d5367113e80a24261ccebc01d62607..f41dbe38132d23bcd1eeb0b8c2e806afd5bdf875 100644 (file)
--- a/coreObject.xml
+++ b/coreObject.xml
@@ -2,7 +2,7 @@
 <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/coreObject.xsd">
        <import>
                <coreobject>
-                       <objectname><![CDATA[wcf\system\conversation\ConversationHandler]]></objectname>
+                       <objectname>wcf\system\conversation\ConversationHandler</objectname>
                </coreobject>
        </import>
 </data>

diff --git a/objectType.xml b/objectType.xml
index 9bf86133e5f3dc71a6638a7e1d776c135e6829f1..9b0ff4353bdb138c5875b876be043d1bf8925daf 100644 (file)
--- a/objectType.xml
+++ b/objectType.xml
@@ -62,27 +62,27 @@
                <type>
                        <name>com.woltlab.wcf.conversation</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\ConversationImporter]]></classname>
+                       <classname>wcf\system\importer\ConversationImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.conversation.label</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\ConversationLabelImporter]]></classname>
+                       <classname>wcf\system\importer\ConversationLabelImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.conversation.message</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\ConversationMessageImporter]]></classname>
+                       <classname>wcf\system\importer\ConversationMessageImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.conversation.user</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\ConversationUserImporter]]></classname>
+                       <classname>wcf\system\importer\ConversationUserImporter</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.conversation.attachment</name>
                        <definitionname>com.woltlab.wcf.importer</definitionname>
-                       <classname><![CDATA[wcf\system\importer\ConversationAttachmentImporter]]></classname>
+                       <classname>wcf\system\importer\ConversationAttachmentImporter</classname>
                </type>
                <!-- /importers -->
                
@@ -90,12 +90,12 @@
                <type>
                        <name>com.woltlab.wcf.conversation</name>
                        <definitionname>com.woltlab.wcf.rebuildData</definitionname>
-                       <classname><![CDATA[wcf\system\worker\ConversationRebuildDataWorker]]></classname>
+                       <classname>wcf\system\worker\ConversationRebuildDataWorker</classname>
                </type>
                <type>
                        <name>com.woltlab.wcf.conversation.message</name>
                        <definitionname>com.woltlab.wcf.rebuildData</definitionname>
-                       <classname><![CDATA[wcf\system\worker\ConversationMessageRebuildDataWorker]]></classname>
+                       <classname>wcf\system\worker\ConversationMessageRebuildDataWorker</classname>
                        <nicevalue>-5</nicevalue>
                </type>
                <!-- /rebuild data workers -->
@@ -104,13 +104,13 @@
                <type>
                        <name>com.woltlab.wcf.conversation</name>
                        <definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
-                       <classname><![CDATA[wcf\system\stat\ConversationStatDailyHandler]]></classname>
+                       <classname>wcf\system\stat\ConversationStatDailyHandler</classname>
                        <categoryname>com.woltlab.wcf.conversation</categoryname>
                </type>
                <type>
                        <name>com.woltlab.wcf.conversation.message</name>
                        <definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
-                       <classname><![CDATA[wcf\system\stat\ConversationMessageStatDailyHandler]]></classname>
+                       <classname>wcf\system\stat\ConversationMessageStatDailyHandler</classname>
                        <categoryname>com.woltlab.wcf.conversation</categoryname>
                </type>
                <!-- /stat handlers -->

diff --git a/option.xml b/option.xml
index 507134dc4b7c4e1bb05b7ff02387864074518e44..02e57c565244a8e1ac545c65e032425b7566e573 100644 (file)
--- a/option.xml
+++ b/option.xml
@@ -42,15 +42,15 @@
                                <categoryname>message.conversation</categoryname>
                                <optiontype>select</optiontype>
                                <defaultvalue>lastPostTime</defaultvalue>
-                               <selectoptions><![CDATA[subject:wcf.global.subject
-lastPostTime:wcf.conversation.lastPostTime]]></selectoptions>
+                               <selectoptions>subject:wcf.global.subject
+lastPostTime:wcf.conversation.lastPostTime</selectoptions>
                        </option>
                        <option name="conversation_list_default_sort_order">
                                <categoryname>message.conversation</categoryname>
                                <optiontype>select</optiontype>
                                <defaultvalue>DESC</defaultvalue>
-                               <selectoptions><![CDATA[ASC:wcf.global.sortOrder.ascending
-DESC:wcf.global.sortOrder.descending]]></selectoptions>
+                               <selectoptions>ASC:wcf.global.sortOrder.ascending
+DESC:wcf.global.sortOrder.descending</selectoptions>
                        </option>
                </options>
        </import>

diff --git a/page.xml b/page.xml
index ba79cf44e37b3e23e30f439d0334dd775a49c080..ecfcf5ef878c8b92bd22d13f20fba2b8c1d45e8e 100644 (file)
--- a/page.xml
+++ b/page.xml
@@ -4,8 +4,8 @@
                <page identifier="com.woltlab.wcf.conversation.ConversationList">
                        <controller>wcf\page\ConversationListPage</controller>
                        <handler>wcf\system\page\handler\ConversationListPageHandler</handler>
-                       <name language="de"><![CDATA[Konversationenliste]]></name>
-                       <name language="en"><![CDATA[Conversation List]]></name>
+                       <name language="de">Konversationenliste</name>
+                       <name language="en">Conversation List</name>
                        <pageType>system</pageType>
                        
                        <content language="en">
@@ -18,8 +18,8 @@
                <page identifier="com.woltlab.wcf.conversation.Conversation">
                        <controller>wcf\page\ConversationPage</controller>
                        <handler>wcf\system\page\handler\DefaultConversationRelatedPageHandler</handler>
-                       <name language="de"><![CDATA[Konversation]]></name>
-                       <name language="en"><![CDATA[Conversation]]></name>
+                       <name language="de">Konversation</name>
+                       <name language="en">Conversation</name>
                        <pageType>system</pageType>
                        <requireObjectID>1</requireObjectID>
                        <hasFixedParent>1</hasFixedParent>
@@ -27,8 +27,8 @@
                </page>
                <page identifier="com.woltlab.wcf.conversation.ConversationAdd">
                        <controller>wcf\form\ConversationAddForm</controller>
-                       <name language="de"><![CDATA[Konversation starten]]></name>
-                       <name language="en"><![CDATA[New Conversation]]></name>
+                       <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>

diff --git a/userGroupOption.xml b/userGroupOption.xml
index c7480202704ff9b4f133ebff11fb7812c14150f0..0b2e4ce55f92e6cca0867f21c8c0e829b1fb6bde 100644 (file)
--- a/userGroupOption.xml
+++ b/userGroupOption.xml
@@ -97,16 +97,16 @@
                        <option name="user.conversation.allowedAttachmentExtensions">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>textarea</optiontype>
-                               <defaultvalue><![CDATA[gif
+                               <defaultvalue>gif
 jpg
 jpeg
 png
 bmp
 zip
 txt
-pdf]]></defaultvalue>
+pdf</defaultvalue>
                                <options>module_attachment</options>
-                               <wildcard><![CDATA[*]]></wildcard>
+                               <wildcard>*</wildcard>
                                <usersonly>1</usersonly>
                        </option>
                        <option name="user.conversation.maxAttachmentCount">

diff --git a/userOption.xml b/userOption.xml
index 9ad7eb38f69282efb63c44c4e637af429eb29c22..405924934c666dfa0c099053bbb688652210ae5a 100644 (file)
--- a/userOption.xml
+++ b/userOption.xml
@@ -6,9 +6,9 @@
                                <categoryname>settings.privacy.messaging</categoryname>
                                <optiontype>select</optiontype>
                                <editable>3</editable>
-                               <selectoptions><![CDATA[0:wcf.user.access.registered
+                               <selectoptions>0:wcf.user.access.registered
 1:wcf.user.access.following
-2:wcf.user.access.nobody]]></selectoptions>
+2:wcf.user.access.nobody</selectoptions>
                                <defaultvalue>0</defaultvalue>
                                <options>module_conversation</options>
                        </option>
@@ -18,12 +18,12 @@
                                <optiontype>select</optiontype>
                                <editable>3</editable>
                                <defaultvalue>0</defaultvalue>
-                               <selectoptions><![CDATA[0:wcf.global.defaultValue
+                               <selectoptions>0:wcf.global.defaultValue
 5
 10
 20
 30
-40]]></selectoptions>
+40</selectoptions>
                                <options>module_conversation</options>
                        </option>
                        <option name="conversationMessagesPerPage">
@@ -31,12 +31,12 @@
                                <optiontype>select</optiontype>
                                <editable>3</editable>
                                <defaultvalue>0</defaultvalue>
-                               <selectoptions><![CDATA[0:wcf.global.defaultValue
+                               <selectoptions>0:wcf.global.defaultValue
 5
 10
 20
 30
-40]]></selectoptions>
+40</selectoptions>
                                <options>module_conversation</options>
                        </option>
                </options>