Component/Calendar: contribute cron jobs

Author: nhaagen

components/ILIAS/Calendar/Calendar.php

@@ -51,5 +51,17 @@ public function init(
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\NodeModule("eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js");
         */
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilCalendarCronRemoteReader(
+                'components\\' . self::class,
+                $use[\ILIAS\Language\Language::class],
+                true
+            );
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilConsultationHourCron(
+                'components\\' . self::class,
+                $use[\ILIAS\Language\Language::class],
+                true
+            );
     }
 }

components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourCron.php

@@ -26,16 +26,24 @@
  */
 class ilConsultationHourCron extends ilCronJob
 {
-    protected ilLanguage $lng;
     protected ilDBInterface $db;
     protected ilSetting $setting;
 
-    public function __construct()
+    public function __construct(
+        string $component,
+        \ILIAS\Language\Language $lng,
+        bool $registration = false
+    ) {
+        parent::__construct($component, $lng);
+        $this->lng->loadLanguageModule('dateplaner');
+        if (!$registration) {
+            $this->additionalConstruct();
+        }
+    }
+
+    private function additionalConstruct()
     {
         global $DIC;
-
-        $this->lng = $DIC->language();
-        $this->lng->loadLanguageModule('dateplaner');
         $this->db = $DIC->database();
         $this->setting = $DIC->settings();
     }

components/ILIAS/Calendar/classes/Cron/class.ilCalendarCronRemoteReader.php

@@ -24,16 +24,24 @@ class ilCalendarCronRemoteReader extends ilCronJob
 {
     private const DEFAULT_SYNC_HOURS = 1;
 
-    private ilLanguage $lng;
     private ilLogger $logger;
-
     private ?ilCalendarSettings $calendar_settings = null;
 
-    public function __construct()
+    public function __construct(
+        string $component,
+        \ILIAS\Language\Language $lng,
+        bool $registration = false
+    ) {
+        parent::__construct($component, $lng);
+        $this->lng->loadLanguageModule('dateplaner');
+        if (!$registration) {
+            $this->additionalConstruct();
+        }
+    }
+
+    private function additionalConstruct()
     {
         global $DIC;
-
-        $this->lng = $DIC->language();
         $this->logger = $DIC->logger()->cal();
         $this->calendar_settings = ilCalendarSettings::_getInstance();
     }
@@ -106,8 +114,8 @@ public function run(): ilCronJobResult
             $reader->setUser($remoteCalendar->getRemoteUser());
             $reader->setPass($remoteCalendar->getRemotePass());
             try {
-            $reader->read();
-            $reader->import($remoteCalendar);
+                $reader->read();
+                $reader->import($remoteCalendar);
             } catch (Exception $e) {
                 $this->logger->warning('Remote Calendar: ' . $remoteCalendar->getCategoryID());
                 $this->logger->warning('Reading remote calendar failed with message: ' . $e->getMessage());

components/ILIAS/Calendar/service.xml

@@ -16,10 +16,6 @@
 		<event type="listen" id="components/ILIAS/Exercise" />
 		<event type="listen" id="components/ILIAS/EmployeeTalk" />
 	</events>
-	<crons>
-		<cron id="cal_remote_reader" class="ilCalendarCronRemoteReader" path="Services/Calendar/classes/Cron/" />
-		<cron id="cal_consultation" class="ilConsultationHourCron" path="Services/Calendar/classes/ConsultationHours/" />
-	</crons>
 	<pluginslots>
 		<pluginslot id="capm" name="AppointmentCustomModal" />
 		<pluginslot id="capg" name="AppointmentCustomGrid" />