From c82ae202dc19971ffd823ec43fc43db8d5d1d672 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 12 Aug 2011 16:40:01 +0200
Subject: [PATCH] Forgotten changes and temporary removed code piece added
 again

---
 .../system/cronjob/CleanUpCronjobLogCronjob.class.php |  5 +++--
 .../system/cronjob/CleanUpSessionLogCronjob.class.php |  3 ++-
 .../system/cronjob/CleanupListenerCronjob.class.php   |  3 ++-
 .../lib/system/cronjob/GetUpdateInfoCronjob.class.php |  5 +++--
 .../files/lib/system/cronjob/ICronjob.class.php       | 11 ++++-------
 .../cronjob/RefreshSearchRobotsCronjob.class.php      |  7 ++++---
 .../CronjobsPackageInstallationPlugin.class.php       |  9 +++++++++
 7 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/cronjob/CleanUpCronjobLogCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/CleanUpCronjobLogCronjob.class.php
index 528d267cc5..7d69381b24 100644
--- a/wcfsetup/install/files/lib/system/cronjob/CleanUpCronjobLogCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/CleanUpCronjobLogCronjob.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\cronjob;
+use wcf\data\cronjob\Cronjob;
 use wcf\system\WCF;
 
 /**
@@ -16,8 +17,8 @@ class CleanUpCronjobLogCronjob implements ICronjob {
 	/**
 	 * @see wcf\system\ICronjob::execute()
 	 */
-	public function execute(array $data) {
-		$sql = "DELETE FROM	wcf".WCF_N."_cronjobs_log
+	public function execute(Cronjob $cronjob) {
+		$sql = "DELETE FROM	wcf".WCF_N."_cronjob_log
 			WHERE		execTime < ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		$statement->execute(array(
diff --git a/wcfsetup/install/files/lib/system/cronjob/CleanUpSessionLogCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/CleanUpSessionLogCronjob.class.php
index 18b2b021ba..13a0d844de 100644
--- a/wcfsetup/install/files/lib/system/cronjob/CleanUpSessionLogCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/CleanUpSessionLogCronjob.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\cronjob;
+use wcf\data\cronjob\Cronjob;
 use wcf\system\WCF;
 
 /**
@@ -16,7 +17,7 @@ class CleanUpSessionLogCronjob implements ICronjob {
 	/**
 	 * @see wcf\system\ICronjob::execute()
 	 */
-	public function execute(array $data) {
+	public function execute(Cronjob $cronjob) {
 		// delete access log
 		$sql = "DELETE FROM	wcf".WCF_N."_acp_session_access_log
 			WHERE		sessionLogID IN (
diff --git a/wcfsetup/install/files/lib/system/cronjob/CleanupListenerCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/CleanupListenerCronjob.class.php
index d33bfc74c4..ed228fedd4 100644
--- a/wcfsetup/install/files/lib/system/cronjob/CleanupListenerCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/CleanupListenerCronjob.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\cronjob;
+use wcf\data\cronjob\Cronjob;
 use wcf\system\cleanup\CleanupHandler;
 
 /**
@@ -16,7 +17,7 @@ class CleanupListenerCronjob implements ICronjob {
 	/**
 	 * @see wcf\system\ICronjob::execute()
 	 */
-	public function execute(array $data) {
+	public function execute(Cronjob $cronjob) {
 		CleanupHandler::getInstance()->execute();
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php
index 1d9955c63a..564ccebb78 100644
--- a/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\cronjob;
 use wcf\acp\package\update\PackageUpdate;
+use wcf\data\cronjob\Cronjob;
 
 /**
  * Gets update package information.
@@ -17,7 +18,7 @@ class GetUpdateInfoCronjob implements ICronjob {
 	 * @see	wcf\system\ICronjob::execute()
 	 * @TODO Change path and move method to lib/system/package
 	 */
-	public function execute(array $data) {
-		PackageUpdate::refreshPackageDatabaseAutomatically();
+	public function execute(Cronjob $cronjob) {
+		//PackageUpdate::refreshPackageDatabaseAutomatically();
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php
index b0759cfe91..9a8f7227be 100644
--- a/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\cronjob;
+use wcf\data\cronjob\Cronjob;
 
 /**
  * Any Cronjob should implement this interface.
@@ -13,13 +14,9 @@ namespace wcf\system\cronjob;
  */
 interface ICronjob {
 	/**
-	 * To be called when executing the cronjob; the $data array e.g. might be used for passing
-	 * meaningful values to the cronjob in order to reasonably avail multipleExecs.
+	 * Executes the cronjob.
 	 * 
-	 * @param	array		$data		This array should basically contain the dataset 
-	 * 						associated to the executed cronjob, particularly 
-	 * 						the date of the planned execution (the nextExec 
-	 * 						field).
+	 * @param	wcf\data\cronjob\Cronjob	$cronjob	Cronjob object with cronjob data
 	 */
-	public function execute(array $data);
+	public function execute(Cronjob $cronjob);
 }
diff --git a/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php
index 05c36cf350..a3873a3aa5 100644
--- a/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\cronjob;
+use wcf\data\cronjob\Cronjob;
 use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
@@ -22,8 +23,8 @@ class RefreshSearchRobotsCronjob implements ICronjob {
 	/**
 	 * @see wcf\system\ICronjob::execute()
 	 */
-	public function execute(array $data) {
-		$filename = FileUtil::downloadFileFromHttp('http://www.woltlab.com/spiderlist/spiderlist.xml', 'spiders');
+	public function execute(Cronjob $cronjob) {
+		/* $filename = FileUtil::downloadFileFromHttp('http://www.woltlab.com/spiderlist/spiderlist.xml', 'spiders');
 		$xml = new XML($filename);
 		$spiders = $xml->getElementTree('spiderlist');
 		
@@ -73,6 +74,6 @@ class RefreshSearchRobotsCronjob implements ICronjob {
 		}
 		
 		// delete tmp file
-		@unlink($filename);
+		@unlink($filename);*/
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/package/plugin/CronjobsPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/CronjobsPackageInstallationPlugin.class.php
index 8b29bf3221..92c7f58942 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/CronjobsPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/CronjobsPackageInstallationPlugin.class.php
@@ -76,4 +76,13 @@ class CronjobsPackageInstallationPlugin extends AbstractXMLPackageInstallationPl
 	protected function findExistingItem(array $data) {
 		return null;
 	}
+	
+	/**
+	 * @see	wcf\system\package\plugin\AbstractXMLPackageInstallationPlugin::prepareCreate()
+	 */
+	protected function prepareCreate(array &$data) {
+		parent::prepareCreate($data);
+		
+		$data['nextExec'] = TIME_NOW;
+	}
 }
-- 
2.20.1