Merge branch 'main' into feat/add-support-for-database-cc-and-bcc

Author: Jnoack331

src/Resources/app/administration/src/module/frosh-mail-archive/page/frosh-mail-archive-detail/frosh-mail-archive-detail.twig

@@ -99,11 +99,15 @@
                     :title="$t('frosh-mail-archive.detail.content.title')"
                     position-identifier="frosh-mail-archive-content"
             >
-                <h4>HTML</h4>
-                <iframe :src="htmlText" sandbox frameborder="0"></iframe>
+                <template v-if="archive.htmlText">
+                    <h4>HTML</h4>
+                    <iframe :src="htmlText" sandbox frameborder="0"></iframe>
+                </template>
 
-                <h4>Plain</h4>
-                <iframe :src="plainText" sandbox frameborder="0"></iframe>
+                <template v-if="archive.plainText">
+                    <h4>Plain</h4>
+                    <iframe :src="plainText" sandbox frameborder="0"></iframe>
+                </template>
             </sw-card>
             <sw-card :title="$t('frosh-mail-archive.detail.attachments.title')"
                      position-identifier="frosh-mail-archive-attachments"

src/Resources/app/administration/src/module/frosh-mail-archive/page/frosh-mail-archive-index/index.js

@@ -100,6 +100,25 @@ Component.register('frosh-mail-archive-index', {
             return this.$tc(`frosh-mail-archive.state.${state}`);
         },
 
+        updateData(query) {
+            for (const filter in this.filter) {
+                this.filter[filter] = query[filter] ?? null;
+            }
+        },
+
+        saveFilters() {
+            this.updateRoute({
+                limit: this.limit,
+                page: this.page,
+                term: this.term,
+                sortBy: this.sortBy,
+                sortDirection: this.sortDirection,
+                naturalSorting: this.naturalSorting,
+            },
+                this.filter
+            );
+        },
+
         getList() {
             this.isLoading = true;
 
@@ -129,6 +148,7 @@ Component.register('frosh-mail-archive-index', {
                     this.items = searchResult;
                     this.total = searchResult.total;
                     this.isLoading = false;
+                    this.saveFilters();
                 });
         },
 

src/Services/MailSender.php

@@ -78,9 +78,7 @@ private function saveMail(string $id, Email $message, array $metadata): void
                 'id' => $id,
                 'sender' => [$message->getFrom()[0]->getAddress() => $message->getFrom()[0]->getName()],
                 'receiver' => $this->convertAddress($message->getTo()),
-                'subject' => $message->getSubject(),
-                'cc' => $message->getCc(),
-                'bcc' => $message->getBcc(),
+                'subject' => $message->getSubject() ?? '',
                 'plainText' => nl2br((string) $message->getTextBody()),
                 'htmlText' => $message->getHtmlBody(),
                 'emlPath' => $emlPath,