Forgotten changes and temporary removed code piece added again

diff --git a/wcfsetup/install/files/lib/system/cronjob/CleanUpCronjobLogCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/CleanUpCronjobLogCronjob.class.php
index 528d267cc540ad5c8b79c6a5a59dbbdfc13193e0..7d69381b240709744185d2bd831dab1fd5de2a29 100644 (file)
--- 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 18b2b021bad2d395347d6b2c260e61ae3cfb9df4..13a0d844de6af5a70bfef01de2e3fa3ba57b26ae 100644 (file)
--- 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 d33bfc74c47c56c9fa678058c73726ce39ad0376..ed228fedd4327f5b24971ccd30a3ca317dd8006f 100644 (file)
--- 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 1d9955c63a74254e5d9c31ce41ab2cb82d992b54..564ccebb7880f03f0dbadf2494ce80d1c584933f 100644 (file)
--- 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 b0759cfe91718406316e8b2330495220e9a2fd6b..9a8f7227bef6599bb5e462205b6f08191fae35ad 100644 (file)
--- 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 05c36cf3508eaddf7888934e67efb3c643c74e5b..a3873a3aa5dd0056fa77b2d50033c8ada0b6d37b 100644 (file)
--- 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 8b29bf32214ae534760250d2c092d39c0373dc50..92c7f58942bee8b0f085ee605e2980f405367984 100644 (file)
--- 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;
+       }
 }