Component/Mail: contribute cron jobs

Author: nhaagen

components/ILIAS/Mail/Mail.php

@@ -38,5 +38,17 @@ public function init(
             );
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\ComponentJS($this, "ilMailComposeFunctions.js");
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilMailCronNotification(
+                self::class,
+                $use[\ILIAS\Language\Language::class],
+                $use[\ILIAS\Logging\LoggerFactory::class]
+            );
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilMailCronOrphanedMails(
+                self::class,
+                $use[\ILIAS\Language\Language::class],
+                $use[\ILIAS\Logging\LoggerFactory::class]
+            );
     }
 }

components/ILIAS/Mail/classes/class.ilMailCronNotification.php

@@ -28,17 +28,17 @@
 class ilMailCronNotification extends ilCronJob
 {
     private GlobalHttpState $http;
-    protected ilLanguage $lng;
     protected ilSetting $settings;
     protected bool $initDone = false;
 
-    protected function init(): void
+    public function init(): void
     {
+        $this->lng->loadLanguageModule('mail');
+
         global $DIC;
 
         if (!$this->initDone) {
             $this->settings = $DIC->settings();
-            $this->lng = $DIC->language();
             $this->http = $DIC->http();
 
             $this->initDone = true;
@@ -52,17 +52,11 @@ public function getId(): string
 
     public function getTitle(): string
     {
-        $this->init();
-
         return $this->lng->txt('cron_mail_notification');
     }
 
     public function getDescription(): string
     {
-        $this->init();
-
-        $this->lng->loadLanguageModule('mail');
-
         return  sprintf(
             $this->lng->txt('cron_mail_notification_desc'),
             $this->lng->txt('mail_allow_external')

components/ILIAS/Mail/classes/class.ilMailCronOrphanedMails.php

@@ -36,20 +36,18 @@ class ilMailCronOrphanedMails extends ilCronJob
 {
     private GlobalHttpState $http;
     private Refinery $refinery;
-    private ilLanguage $lng;
     private ilSetting $settings;
     private ilDBInterface $db;
     private ilObjUser $user;
     private bool $initDone = false;
     private ilCronManager $cron_manager;
 
-    private function init(): void
+    public function init(): void
     {
         global $DIC;
 
         if (!$this->initDone) {
             $this->settings = $DIC->settings();
-            $this->lng = $DIC->language();
             $this->db = $DIC->database();
             $this->user = $DIC->user();
             $this->http = $DIC->http();
@@ -91,13 +89,11 @@ public function getId(): string
 
     public function getTitle(): string
     {
-        $this->init();
         return $this->lng->txt('mail_orphaned_mails');
     }
 
     public function getDescription(): string
     {
-        $this->init();
         return $this->lng->txt('mail_orphaned_mails_desc');
     }
 

components/ILIAS/Mail/service.xml

@@ -10,10 +10,6 @@
 			<parent id="adm" max="1">adm</parent>
 		</object>
 	</objects>
-	<crons>
-		<cron id="mail_notification" class="ilMailCronNotification" />
-		<cron id="mail_orphaned_mails" class="ilMailCronOrphanedMails" />
-	</crons>
 	<mailtemplates>
 		<context id="mail_template_generic" class="ilMailTemplateGenericContext" />
 	</mailtemplates>