Merge pull request #1755 from IrAlfred/add-bcc-field-to-saved-fields

feat(other): persist Bcc header in sent and draft messages

Author: kroky

modules/imap/output_modules.php

@@ -183,7 +183,7 @@ class Hm_Output_filter_message_headers extends Hm_Output_Module {
       protected function output() {
         if ($this->get('msg_headers')) {
             $txt = '';
-            $small_headers = array('subject', 'x-snoozed', 'date', 'from', 'to', 'reply-to', 'cc', 'flags');
+            $small_headers = array('subject', 'x-snoozed', 'date', 'from', 'to', 'reply-to', 'cc', 'x-original-bcc', 'flags');
             $reply_args = sprintf('&list_path=%s&uid=%s',
                 $this->html_safe($this->get('msg_list_path')),
                 $this->html_safe($this->get('msg_text_uid'))
@@ -298,6 +298,9 @@ protected function output() {
                                 }
                                 $value = implode(', ', $new_value);
                             }
+                            if (mb_strtolower($name) == 'x-original-bcc') {
+                                $name = 'Bcc';
+                            }
                             $txt .= '<div class="row g-0 py-0 py-sm-1 small_header d-flex">';
                             $txt .= '<div class="col-md-2"><span class="text-muted">'.$this->trans($name).'</span></div>';
                             $txt .= '<div class="col-md-10 col-12 js-header_' . strtolower($name) . '">'.$this->html_safe($value).'</div>';

modules/smtp/hm-mime-message.php

@@ -129,6 +129,16 @@ function set_auto_bcc($addr) {
         $this->headers['X-Auto-Bcc'] = 'cypht';
     }
 
+    function set_original_bcc_header() {
+        if ($this->bcc) {
+            $this->headers['X-Original-Bcc'] = $this->bcc;
+        }
+    }
+
+    function get_bcc() {
+        return $this->bcc;
+    }
+
     function quote_fld($val) {
         if (!trim($val)) {
             return '';

modules/smtp/modules.php

@@ -101,6 +101,10 @@ public function process() {
                     $imap_draft['Cc'] = $this->unangle($msg_header['Cc']);
                 }
 
+                if (array_key_exists('X-Original-Bcc', $msg_header)) {
+                    $imap_draft['Bcc'] = $this->unangle($msg_header['X-Original-Bcc']);
+                }
+
                 if ($imap_draft) {
                     recip_count_check($imap_draft, $this);
                     $this->out('draft_id', $this->request->get['uid']);
@@ -769,6 +773,7 @@ public function process() {
 
         /* check for associated IMAP server to save a copy */
         if ($imap_server !== false) {
+            $mime->set_original_bcc_header();
             $this->out('save_sent_server', $imap_server, false);
             $this->out('save_sent_msg', $mime);
         }
@@ -1148,6 +1153,9 @@ protected function output() {
             if (array_key_exists('Cc', $imap_draft)) {
                 $cc = $imap_draft['Cc'];
             }
+            if (array_key_exists('Bcc', $imap_draft)) {
+                $bcc = $imap_draft['Bcc'];
+            }
             if (array_key_exists('From', $imap_draft)) {
                 $from = $imap_draft['From'];
             }
@@ -2035,6 +2043,8 @@ function prepare_draft_mime($atts, $uploaded_files, $from = false, $name = '', $
         $profile_id
     );
 
+    $mime->set_original_bcc_header();
+
     $mime->add_attachments($uploaded_files);
 
     return $mime;