[Feature] Mail: IRSS

components/ILIAS/Badge/classes/class.ilBadgeHandler.php

@@ -21,6 +21,7 @@
 use ILIAS\Notifications\Model\ilNotificationLink;
 use ILIAS\Notifications\Model\ilNotificationParameter;
 use ILIAS\Badge\GlobalScreen\BadgeNotificationProvider;
+use ILIAS\Mail\Attachments\MailAttachments;
 
 /**
  * Class ilBadgeHandler
@@ -537,7 +538,7 @@ public function sendNotification(
                     '',
                     $lng->txt('badge_notification_subject'),
                     $ntf->composeAndGetMessage($user_id, null, 'read', true),
-                    []
+                    MailAttachments::empty()
                 );
 
 

components/ILIAS/Calendar/classes/class.ilCalendarMailNotification.php

@@ -18,6 +18,8 @@
 
 declare(strict_types=1);
 
+use ILIAS\Mail\Attachments\MailAttachments;
+
 /**
  * Distributes calendar mail notifications
  * @author  Stefan Meyer <smeyer.ilias@gmx.de>
@@ -448,8 +450,6 @@ public function send(): void
                 $this->sendMail(array($user_id), true);
                 break;
         }
-
-        $this->deleteAttachments();
     }
 
     protected function addAttachment(): void
@@ -461,18 +461,16 @@ protected function addAttachment(): void
 
         $ics_filename = 'appointment_' . (new DateTimeImmutable('now'))->format('Ymd_His_u') . '.ics';
 
-        $attachment = new ilFileDataMail($this->getSender());
-        $effective_ics_filename = $attachment->storeAsAttachment(
+        $attachment = $this->initFileDataMail();
+        $rcid = $attachment->createCollectionFromContent(
             $ics_filename,
             $export->getExportString()
         );
 
-        $this->setAttachments([$effective_ics_filename]);
-    }
-
-    protected function deleteAttachments(): void
-    {
-        $attachment = new ilFileDataMail($this->getSender());
-        $attachment->unlinkFiles($this->getAttachments());
+        $this->setAttachments(
+            $rcid !== null
+                ? MailAttachments::fromIrss($rcid)
+                : MailAttachments::empty()
+        );
     }
 }

components/ILIAS/Course/classes/class.ilTimingsCronReminder.php

@@ -21,6 +21,7 @@
 use ILIAS\Cron\Job\Schedule\JobScheduleType;
 use ILIAS\Cron\Job\JobResult;
 use ILIAS\Cron\CronJob;
+use ILIAS\Mail\Attachments\MailAttachments;
 
 class ilTimingsCronReminder extends CronJob
 {
@@ -309,7 +310,7 @@ protected function sendExceededMail(int $user_id, array $ref_ids, string $mail_b
                     '',
                     $this->user_lang->txt('timings_cron_reminder_exceeded_subject'),
                     $mail_body,
-                    [],
+                    MailAttachments::empty(),
                     true
                 );
                 $this->log->debug('...mail send for user ' . $user_id . ' to mail ' . $login . ' has exceeded timings for ' . $mail_body);
@@ -334,7 +335,7 @@ protected function sendFreshlyStartedMail(int $user_id, array $ref_ids, string $
                 '',
                 $this->user_lang->txt('timings_cron_reminder_started_subject'),
                 $mail_body,
-                [],
+                MailAttachments::empty(),
                 true
             );
             $this->log->debug('...mail send for user ' . $user_id . ' to mail ' . $login . ' has freshly started timings for ' . $mail_body);

components/ILIAS/EmployeeTalk/classes/Notification/Notification.php

@@ -20,6 +20,8 @@
 
 namespace ILIAS\EmployeeTalk\Notification;
 
+use ILIAS\Mail\Attachments\MailAttachments;
+
 class Notification
 {
     protected \ilObjUser $to;
@@ -117,10 +119,10 @@ public function send(): void
         }
 
         $attachment_name = 'appointments.ics';
-        $attachment->storeAsAttachment(
-            $attachment_name,
-            $this->attachment
-        );
+        $rcid = $attachment->createCollectionFromContent($attachment_name, $this->attachment);
+        $attachments = $rcid !== null
+            ? MailAttachments::fromIrss($rcid)
+            : MailAttachments::empty();
 
         $mail = new \ilMail(ANONYMOUS_USER_ID);
         $mail->enqueue(
@@ -129,10 +131,8 @@ public function send(): void
             '',
             $subject,
             $notif->composeAndGetMessage($this->to->getId(), null, '', true),
-            [$attachment_name]
+            $attachments
         );
-
-        $attachment->unlinkFile($attachment_name);
     }
 
     protected function getTalkGoto(): string

components/ILIAS/Exercise/Assignment/class.ilExAssignmentReminder.php

@@ -16,6 +16,8 @@
  *
  *********************************************************************/
 
+use ILIAS\Mail\Attachments\MailAttachments;
+
 /**
  *
  * TODO: import/export reminder data with the exercise/assignment.
@@ -561,7 +563,7 @@ protected function sendReminders(array $reminders): int
                 "",
                 $subject,
                 $message,
-                array()
+                MailAttachments::empty()
             );
         }
 

components/ILIAS/Exercise/classes/class.ilObjExercise.php

@@ -23,6 +23,8 @@
 use ILIAS\Filesystem\Exception\IOException;
 use ILIAS\Exercise\InternalService;
 use ILIAS\Exercise\Assignment\Mandatory\MandatoryAssignmentsManager;
+use ILIAS\Mail\Attachments\MailAttachments;
+use ILIAS\ResourceStorage\Identification\ResourceCollectionIdentification;
 
 /**
  * Class ilObjExercise
@@ -454,17 +456,11 @@ public function sendAssignment(ilExAssignment $a_ass, array $a_members): void
 
         // instruction files
         $if = $this->service->domain()->assignment()->instructionFiles($a_ass->getId());
-        $files = $if->getFiles();
-        $file_names = [];
-        if (count($files) > 0) {
-            $mfile_obj = new ilFileDataMail($GLOBALS['DIC']['ilUser']->getId());
-            foreach ($if->getFiles() as $file) {
-                $file_names[] = $file["name"];
-                $mfile_obj->storeAsAttachment(
-                    $file["name"],
-                    $if->getStream($file["rid"])->getContents()
-                );
-            }
+        $attachments = MailAttachments::empty();
+        if ($if->getFiles() !== []) {
+            $attachments = MailAttachments::fromIrss(
+                new ResourceCollectionIdentification($if->getCollectionIdString())
+            );
         }
 
         // recipients
@@ -485,16 +481,10 @@ public function sendAssignment(ilExAssignment $a_ass, array $a_members): void
             "",
             $subject,
             $body,
-            $file_names
+            $attachments
         );
         unset($tmp_mail_obj);
 
-        // remove tmp files
-        if (count($file_names) && $mfile_obj) {
-            $mfile_obj->unlinkFiles($file_names);
-            unset($mfile_obj);
-        }
-
         // set recipients mail status
         foreach ($a_members as $member_id) {
             $member_status = $a_ass->getMemberStatus($member_id);

components/ILIAS/Forum/classes/Notification/class.ilForumCronNotificationDataProvider.php

@@ -18,6 +18,9 @@
 
 declare(strict_types=1);
 
+use ILIAS\Mail\Attachments\MailAttachments;
+use ILIAS\ResourceStorage\Identification\ResourceCollectionIdentification;
+
 /**
  * Class ilForumCronNotificationDataProvider
  * @author Nadia Matuschek <nmatuschek@databay.de>
@@ -46,6 +49,7 @@ class ilForumCronNotificationDataProvider implements ilForumNotificationMailData
     private readonly string $import_name;
     /** @var list<string> */
     private array $attachments = [];
+    private ?MailAttachments $mail_attachments = null;
     /** @var int[] */
     private array $cron_recipients = [];
     private readonly int $post_update_user_id;
@@ -105,14 +109,28 @@ protected function read(): void
 
     private function readAttachments(): void
     {
-        if (ilForumProperties::isSendAttachmentsByMailEnabled()) {
-            $fileDataForum = new ilFileDataForum($this->getObjId(), $this->getPostId());
-            $filesOfPost = $fileDataForum->getFilesOfPost();
+        if (!ilForumProperties::isSendAttachmentsByMailEnabled()) {
+            return;
+        }
+
+        $fileDataForum = new ilFileDataForum($this->getObjId(), $this->getPostId());
+        foreach ($fileDataForum->getFilesOfPost() as $attachment) {
+            $this->attachments[] = $attachment['name'];
+        }
+
+        if ($this->attachments === []) {
+            return;
+        }
 
-            foreach ($filesOfPost as $attachment) {
-                $this->attachments[] = $attachment['name'];
-            }
+        $post = new ilForumPost($this->getPostId());
+        $rcid_string = $post->getRCID();
+        if ($rcid_string === '' || $rcid_string === ilForumPost::NO_RCID) {
+            return;
         }
+
+        $this->mail_attachments = MailAttachments::fromIrss(
+            new ResourceCollectionIdentification($rcid_string)
+        );
     }
 
     public function addRecipient(int $user_id): void
@@ -216,6 +234,11 @@ public function getAttachments(): array
         return $this->attachments;
     }
 
+    public function getMailAttachments(): MailAttachments
+    {
+        return $this->mail_attachments ?? MailAttachments::empty();
+    }
+
     public function getPosDisplayUserId(): int
     {
         return $this->pos_display_user_id;

components/ILIAS/Forum/classes/Notification/class.ilForumMailEventNotificationSender.php

@@ -18,6 +18,8 @@
 
 declare(strict_types=1);
 
+use ILIAS\Mail\Attachments\MailAttachments;
+
 /**
  * @author  Niels Theen <ntheen@databay.de>
  */
@@ -360,7 +362,7 @@ private function createMailValueObjectsWithAttachments(
             '',
             ilStr::strLen($subjectText) > 255 ? ilStr::substr($subjectText, 0, 255) : $subjectText,
             $bodyText,
-            $this->provider->getAttachments(),
+            $this->provider->getMailAttachments(),
             false,
             false
         );
@@ -393,7 +395,7 @@ private function createMailValueObjectWithoutAttachments(
             '',
             ilStr::strLen($subjectText) > 255 ? ilStr::substr($subjectText, 0, 255) : $subjectText,
             $bodyText,
-            [],
+            MailAttachments::empty(),
             false,
             false
         );

components/ILIAS/Forum/classes/Notification/class.ilForumNotificationDataProvider.php

@@ -18,6 +18,9 @@
 
 declare(strict_types=1);
 
+use ILIAS\Mail\Attachments\MailAttachments;
+use ILIAS\ResourceStorage\Identification\ResourceCollectionIdentification;
+
 /**
  * Class ilForumNotificationDataProvider
  * @author Nadia Matuschek <nmatuschek@databay.de>
@@ -35,6 +38,7 @@ class ilForumNotificationDataProvider implements ilForumNotificationMailData
     protected string $thread_title = '';
     /** @var array<string, string> */
     protected array $attachments = [];
+    private ?MailAttachments $mail_attachments = null;
     private readonly ilDBInterface $db;
     private readonly ilAccessHandler $access;
     private readonly ilObjUser $user;
@@ -148,6 +152,11 @@ public function getAttachments(): array
         return $this->attachments;
     }
 
+    public function getMailAttachments(): MailAttachments
+    {
+        return $this->mail_attachments ?? MailAttachments::empty();
+    }
+
     public function getPosUserAlias(): string
     {
         return $this->objPost->getUserAlias();
@@ -314,17 +323,27 @@ public function determineClosestContainer(int $frm_ref_id): ?ilObject
 
     private function readAttachments(): void
     {
-        if (ilForumProperties::isSendAttachmentsByMailEnabled()) {
-            $fileDataForum = new ilFileDataForum($this->getObjId(), $this->objPost->getId());
-            $filesOfPost = $fileDataForum->getFilesOfPost();
+        if (!ilForumProperties::isSendAttachmentsByMailEnabled()) {
+            return;
+        }
 
-            $fileDataMail = new ilFileDataMail(ANONYMOUS_USER_ID);
+        $fileDataForum = new ilFileDataForum($this->getObjId(), $this->objPost->getId());
+        foreach ($fileDataForum->getFilesOfPost() as $attachment) {
+            $this->attachments[$attachment['path']] = $attachment['name'];
+        }
 
-            foreach ($filesOfPost as $attachment) {
-                $this->attachments[$attachment['path']] = $attachment['name'];
-                $fileDataMail->copyAttachmentFile($attachment['path'], $attachment['name']);
-            }
+        if ($this->attachments === []) {
+            return;
         }
+
+        $rcid_string = $this->objPost->getRCID();
+        if ($rcid_string === '' || $rcid_string === ilForumPost::NO_RCID) {
+            return;
+        }
+
+        $this->mail_attachments = MailAttachments::fromIrss(
+            new ResourceCollectionIdentification($rcid_string)
+        );
     }
 
     /**

components/ILIAS/Forum/classes/class.ilForumMailNotification.php

@@ -77,7 +77,7 @@ protected function appendAttachments(): void
                 $this->appendBody($this->getLanguageText('attachment') . ': ' . $attachment . "\n");
             }
             $this->appendBody($this->getBlockBorder() . "\n");
-            $this->setAttachments($this->provider->getAttachments());
+            $this->setAttachments($this->provider->getMailAttachments());
         }
     }
 

components/ILIAS/Forum/interfaces/interface.ilForumNotificationMailData.php

@@ -18,6 +18,8 @@
 
 declare(strict_types=1);
 
+use ILIAS\Mail\Attachments\MailAttachments;
+
 /**
  * Interface ilForumNotificationMailData
  * @author Nadia Matuschek <nmatuschek@databay.de>
@@ -71,5 +73,7 @@ public function getCensorshipComment(): string;
 
     public function getAttachments(): array;
 
+    public function getMailAttachments(): MailAttachments;
+
     public function getDeletedBy(): string;
 }

components/ILIAS/LearningModule/classes/class.ilLearningModuleNotification.php

@@ -16,6 +16,8 @@
  *
  *********************************************************************/
 
+use ILIAS\Mail\Attachments\MailAttachments;
+
 /**
  * Class ilLearningModuleNotification class
  *
@@ -109,7 +111,7 @@ public function send(): void
                     "",
                     $subject,
                     $message,
-                    []
+                    MailAttachments::empty()
                 );
             }
         }