[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.4-104-g1b7a580044

[? sunnavy]

The branch, 4.4-trunk has been updated
       via  1b7a58004491ca9f87e93f71465c0faae0c5dd50 (commit)
       via  7d9d841dbd2d3aa84ab3ea21be73eed3a4368d01 (commit)
      from  e4947baf7cbb1b8aaf82527f6719dbe9d1b9b336 (commit)

Summary of changes:
 etc/RT_Config.pm.in     |  8 ++++++++
 sbin/rt-email-digest.in | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 7d9d841dbd2d3aa84ab3ea21be73eed3a4368d01
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Fri May 15 13:27:55 2020 -0400

    Add encryption and signing options for digest email

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index f59de9ca2c..44e8ce56d1 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2991,6 +2991,10 @@ Set C<Dashboards> to a hash with Encrypt and Sign keys to control
 whether dashboards should be encrypted and/or signed correspondingly.
 By default they are not encrypted or signed.
 
+Similarly, set C<DigestEmail> to a hash with Encrypt and Sign keys
+to control whether digest email should be encrypted and/or signed.
+By default they are not encrypted or signed.
+
 =back
 
 =cut
@@ -3008,6 +3012,10 @@ Set( %Crypt,
         Encrypt => 0,
         Sign    => 0,
     },
+    DigestEmail => {
+        Encrypt => 0,
+        Sign    => 0,
+    },
 );
 
 =head2 SMIME configuration
diff --git a/sbin/rt-email-digest.in b/sbin/rt-email-digest.in
index 23287184d5..0bc68d7e04 100644
--- a/sbin/rt-email-digest.in
+++ b/sbin/rt-email-digest.in
@@ -179,7 +179,15 @@ sub send_digest {
         $digest_template->MIMEObj->print;
         return 1;
     } else {
-        return  RT::Interface::Email::SendEmail( Entity      => $digest_template->MIMEObj)
+        my $ok = RT::Interface::Email::SendEmail(
+            %{ RT->Config->Get('Crypt')->{'DigestEmail'} || {} },
+            Entity => $digest_template->MIMEObj );
+
+        if (!$ok) {
+            RT->Logger->error("Failed to send email digest to $to");
+        }
+
+        return $ok;
     }
 }
 

commit 1b7a58004491ca9f87e93f71465c0faae0c5dd50
Merge: e4947baf7c 7d9d841dbd
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue May 19 01:30:13 2020 +0800

    Merge branch '4.4/crypt-digest-email' into 4.4-trunk


-----------------------------------------------------------------------