Merge branch '5.3'

[GitHub/WoltLab/com.woltlab.wcf.conversation.git] / eventListener.xml

diff --git a/eventListener.xml b/eventListener.xml
index 9d9ec72873d244da6a8e5bc253a63bb80c27672e..6be706bc52ac0115c48f3eddae1015f3ea6be553 100644 (file)
--- a/eventListener.xml
+++ b/eventListener.xml
@@ -1,5 +1,5 @@
 <?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/eventListener.xsd">
+<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/2019/eventListener.xsd">
        <import>
                <eventlistener name="userMerge">
                        <eventclassname>wcf\acp\form\UserMergeForm</eventclassname>
@@ -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>
@@ -20,27 +18,30 @@
                        <listenerclassname>wcf\system\event\listener\ConversationUserActionRenameListener</listenerclassname>
                        <environment>admin</environment>
                </eventlistener>
-       </import>
-       
-       <delete>
-               <eventlistener>
-                       <eventclassname>wcf\acp\form\UserMergeForm</eventclassname>
-                       <eventname>save</eventname>
-                       <listenerclassname>wcf\system\event\listener\ConversationUserMergeListener</listenerclassname>
+               <eventlistener name="pruneIpAddresses">
+                       <eventclassname>wcf\system\cronjob\PruneIpAddressesCronjob</eventclassname>
+                       <eventname>execute</eventname>
+                       <listenerclassname>wcf\system\event\listener\ConversationPruneIpAddressesCronjobListener</listenerclassname>
+                       <environment>user</environment>
+               </eventlistener>
+               <eventlistener name="pruneIpAddressesAdmin">
+                       <eventclassname>wcf\system\cronjob\PruneIpAddressesCronjob</eventclassname>
+                       <eventname>execute</eventname>
+                       <listenerclassname>wcf\system\event\listener\ConversationPruneIpAddressesCronjobListener</listenerclassname>
                        <environment>admin</environment>
                </eventlistener>
-               
-               <eventlistener>
-                       <eventclassname>wcf\data\user\UserAction</eventclassname>
-                       <eventname>rename</eventname>
-                       <listenerclassname>wcf\system\event\listener\ConversationUserActionRenameListener</listenerclassname>
-                       <environment>user</environment>
+               <eventlistener name="userGroupAddCanBeAddedAsConversationParticipant">
+                       <eventclassname>wcf\acp\form\UserGroupAddForm</eventclassname>
+                       <eventname>assignVariables,readFormParameters,save</eventname>
+                       <listenerclassname>wcf\system\event\listener\UserGroupAddCanBeAddedAsConversationParticipantListener</listenerclassname>
+                       <environment>admin</environment>
+                       <inherit>1</inherit>
                </eventlistener>
-               <eventlistener>
-                       <eventclassname>wcf\data\user\UserAction</eventclassname>
-                       <eventname>rename</eventname>
-                       <listenerclassname>wcf\system\event\listener\ConversationUserActionRenameListener</listenerclassname>
+               <eventlistener name="userGroupEditCanBeAddedAsConversationParticipant">
+                       <eventclassname>wcf\acp\form\UserGroupEditForm</eventclassname>
+                       <eventname>readData</eventname>
+                       <listenerclassname>wcf\system\event\listener\UserGroupAddCanBeAddedAsConversationParticipantListener</listenerclassname>
                        <environment>admin</environment>
                </eventlistener>
-       </delete>
+       </import>
 </data>