From 4bc538f367d5d148cba0c0f49fc3215a29f7d2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <timwolla@arcor.de>
Date: Sun, 11 Aug 2013 17:30:34 +0200
Subject: [PATCH] Extend HourlyCleanUpCronjob instead of an own cronjob

---
 cronjob.xml                                   | 17 ------
 eventListener.xml                             | 17 ++++++
 ...onjobExecuteChatCleanUpListener.class.php} | 56 +++++++++----------
 package.xml                                   |  3 +-
 4 files changed, 47 insertions(+), 46 deletions(-)
 delete mode 100644 cronjob.xml
 create mode 100644 eventListener.xml
 rename file/lib/system/{cronjob/CleanupCronjob.class.php => event/listener/HourlyCleanUpCronjobExecuteChatCleanUpListener.class.php} (67%)

diff --git a/cronjob.xml b/cronjob.xml
deleted file mode 100644
index e4e10a6..0000000
--- a/cronjob.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/maelstrom/cronjob.xsd">
-	<import>
-		<cronjob>
-			<classname>chat\system\cronjob\CleanupCronjob</classname>
-			<description>Cleans up Tims Chat</description>
-			<startminute>*/15</startminute>
-			<starthour>*</starthour>
-			<startdom>*</startdom>
-			<startmonth>*</startmonth>
-			<startdow>*</startdow>
-			<active>1</active>
-			<canbeedited>1</canbeedited>
-			<canbedisabled>0</canbedisabled>
-		</cronjob>
-	</import>
-</data>
\ No newline at end of file
diff --git a/eventListener.xml b/eventListener.xml
new file mode 100644
index 0000000..0d1d3f1
--- /dev/null
+++ b/eventListener.xml
@@ -0,0 +1,17 @@
+<?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/maelstrom/eventListener.xsd">
+	<import>
+		<eventlistener>
+			<eventclassname>wcf\system\cronjob\DailyCleanUpCronjob</eventclassname>
+			<eventname>execute</eventname>
+			<listenerclassname>chat\system\event\listener\HourlyCleanUpCronjobExecuteChatCleanUpListener</listenerclassname>
+			<environment>user</environment>
+		</eventlistener>
+		<eventlistener>
+			<eventclassname>wcf\system\cronjob\DailyCleanUpCronjob</eventclassname>
+			<eventname>execute</eventname>
+			<listenerclassname>chat\system\event\listener\HourlyCleanUpCronjobExecuteChatCleanUpListener</listenerclassname>
+			<environment>admin</environment>
+		</eventlistener>
+	</import>
+</data>
\ No newline at end of file
diff --git a/file/lib/system/cronjob/CleanupCronjob.class.php b/file/lib/system/event/listener/HourlyCleanUpCronjobExecuteChatCleanUpListener.class.php
similarity index 67%
rename from file/lib/system/cronjob/CleanupCronjob.class.php
rename to file/lib/system/event/listener/HourlyCleanUpCronjobExecuteChatCleanUpListener.class.php
index 5933522..c043388 100644
--- a/file/lib/system/cronjob/CleanupCronjob.class.php
+++ b/file/lib/system/event/listener/HourlyCleanUpCronjobExecuteChatCleanUpListener.class.php
@@ -1,28 +1,28 @@
-<?php
-namespace chat\system\cronjob;
-use \chat\data;
-
-/**
- * Vaporizes unneeded data.
- *
- * @author 	Tim Düsterhus
- * @copyright	2010-2013 Tim Düsterhus
- * @license	Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
- * @package	be.bastelstu.chat
- * @subpackage	system.cronjob
- */
-class CleanupCronjob implements \wcf\system\cronjob\ICronjob {
-	/**
-	 * @see wcf\system\ICronjob::execute()
-	 */
-	public function execute(\wcf\data\cronjob\Cronjob $cronjob) {
-		$messageAction = new data\message\MessageAction(array(), 'prune');
-		$messageAction->executeAction();
-		$roomAction = new data\room\RoomAction(array(), 'prune');
-		$roomAction->executeAction();
-		
-		// kill dead users
-		$roomAction = new data\room\RoomAction(array(), 'removeDeadUsers');
-		$roomAction->executeAction();
-	}
-}
+<?php
+namespace chat\system\event\listener;
+use \chat\data;
+
+/**
+ * Vaporizes unneeded data.
+ *
+ * @author 	Tim Düsterhus
+ * @copyright	2010-2013 Tim Düsterhus
+ * @license	Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
+ * @package	be.bastelstu.chat
+ * @subpackage	system.event.listener
+ */
+class HourlyCleanUpCronjobExecuteChatCleanUpListener implements IEventListener {
+	/**
+	 * @see	\wcf\system\event\IEventListener::execute()
+	 */
+	public function execute($eventObj, $className, $eventName) {
+		$messageAction = new data\message\MessageAction(array(), 'prune');
+		$messageAction->executeAction();
+		$roomAction = new data\room\RoomAction(array(), 'prune');
+		$roomAction->executeAction();
+		
+		// kill dead users
+		$roomAction = new data\room\RoomAction(array(), 'removeDeadUsers');
+		$roomAction->executeAction();
+	}
+}
diff --git a/package.xml b/package.xml
index a334d00..a0bb007 100644
--- a/package.xml
+++ b/package.xml
@@ -34,7 +34,7 @@
 		<instruction type="aclOption">aclOption.xml</instruction>
 		<instruction type="acpMenu">acpMenu.xml</instruction>
 		<instruction type="userGroupOption">userGroupOption.xml</instruction>
-		<instruction type="cronjob">cronjob.xml</instruction>
+		<instruction type="eventListener">eventListener.xml</instruction>
 		<instruction type="dashboardBox">dashboardBox.xml</instruction>
 		<instruction type="script" run="standalone">acp/be.bastelstu.chat.install.php</instruction>
 	</instructions>
@@ -51,6 +51,7 @@
 		<instruction type="aclOption">aclOption.xml</instruction>
 		<instruction type="acpMenu">acpMenu.xml</instruction>
 		<instruction type="userGroupOption">userGroupOption.xml</instruction>
+		<instruction type="eventListener">eventListener.xml</instruction>
 		<instruction type="dashboardBox">dashboardBox.xml</instruction>
 		<instruction type="script" run="standalone">acp/be.bastelstu.chat.update.php</instruction>
 	</instructions>