[Rt-commit] rt branch, 4.2/smime-v2, updated. rt-4.0.4-523-g1f48850

[Ruslan Zakirov]

The branch, 4.2/smime-v2 has been updated
       via  1f488505daa0330bd54d634859b412792ea29504 (commit)
       via  c100ed1604a9d219eb0899c95d676b210ca5e391 (commit)
       via  d3ff908ddfff1697b1ce01fdee44f60df0fbea9a (commit)
      from  2b976ece3bf0494f3e76e2a7a3ee77c84d6fbe27 (commit)

Summary of changes:
 etc/RT_Config.pm.in                 |  9 +++++++++
 lib/RT/Dashboard/Mailer.pm          |  1 +
 share/html/Elements/Crypt/KeyIssues | 12 +++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit d3ff908ddfff1697b1ce01fdee44f60df0fbea9a
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jul 18 01:27:18 2012 +0400

    adjust wording in KeyIssues to suite GnuPG and SMIME

diff --git a/share/html/Elements/Crypt/KeyIssues b/share/html/Elements/Crypt/KeyIssues
index 9875f80..44a39b4 100644
--- a/share/html/Elements/Crypt/KeyIssues
+++ b/share/html/Elements/Crypt/KeyIssues
@@ -46,7 +46,7 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % if ( @$Issues || @$SignAddresses ) {
-<&| /Widgets/TitleBox, title => loc('GnuPG issues') &>
+<&| /Widgets/TitleBox, title => loc('[_1] issues', RT->Config->Get('Crypt')->{'Outgoing'}) &>
 
 % if ( @$SignAddresses ) {
 <% loc("The system is unable to sign outgoing email messages. This usually indicates that the passphrase was mis-set, or that GPG Agent is down. Please alert your system administrator immediately. The problem addresses are:") %>
@@ -58,9 +58,9 @@
 % }
 
 % if (@$Issues == 1) {
-<% loc("You are going to encrypt outgoing email messages, but there is a problem with a recipient's public key. You have to fix the problem with the key, disable sending a message to that recipient, or disable encryption.") %>
+<% loc("You are going to encrypt outgoing email messages, but there is a problem with a recipient's public key/certificate. You have to fix the problem with the key/certificate, disable sending a message to that recipient, or disable encryption.") %>
 % } elsif (@$Issues > 1) {
-<% loc("You are going to encrypt outgoing email messages, but there are problems with recipients' public keys. You have to fix the problems with the keys, disable sending a message to the recipients with key problems, or disable encryption.") %>
+<% loc("You are going to encrypt outgoing email messages, but there are problems with recipients' public keys/certificates. You have to fix the problems with the keys/certificates, disable sending a message to the recipients with problems, or disable encryption.") %>
 % }
 
 <ul>
@@ -69,11 +69,11 @@
 % if ( $issue->{'User'} ) {
 User <a href="<% RT->Config->Get('WebPath') %>/Admin/Users/Modify.html?id=<% $issue->{'User'}->id %>"><&/Elements/ShowUser, User => $issue->{'User'} &></a> has a problem.
 % } else {
-There is a problem with key(s) for address <% $issue->{'EmailAddress'} %>, but there is no user in the DB for this address.
+There is a problem with key/certificate(s) for address <% $issue->{'EmailAddress'} %>, but there is no user in the DB for this address.
 % }
 <% $issue->{'Message'} %>
 <br />
-Select a key you want to use for encryption:
+Select a key/certificate you want to use for encryption:
 <& /Elements/Crypt/SelectKeyForEncryption,
     Name         => 'UseKey-'. $issue->{'EmailAddress'},
     EmailAddress => $issue->{'EmailAddress'},

commit c100ed1604a9d219eb0899c95d676b210ca5e391
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jul 18 01:41:41 2012 +0400

    show GnuPG/SMIME issues box in yellow like results

diff --git a/share/html/Elements/Crypt/KeyIssues b/share/html/Elements/Crypt/KeyIssues
index 44a39b4..ebe165f 100644
--- a/share/html/Elements/Crypt/KeyIssues
+++ b/share/html/Elements/Crypt/KeyIssues
@@ -46,6 +46,7 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % if ( @$Issues || @$SignAddresses ) {
+<div class="results">
 <&| /Widgets/TitleBox, title => loc('[_1] issues', RT->Config->Get('Crypt')->{'Outgoing'}) &>
 
 % if ( @$SignAddresses ) {
@@ -83,6 +84,7 @@ Select a key/certificate you want to use for encryption:
 % }
 </ul>
 </&>
+</div>
 % }
 
 <%ARGS>

commit 1f488505daa0330bd54d634859b412792ea29504
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jul 18 02:55:05 2012 +0400

    make it possible to encrypt/sign dashboards
    
    an option in %Crypt config

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index c9d1e89..7a4d5d8 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2025,6 +2025,10 @@ with incorrect data.
 If you want to allow people to encrypt attachments inside the DB then
 set C<AllowEncryptDataInDB> to 1.
 
+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.
+
 =back
 
 =cut
@@ -2037,6 +2041,11 @@ Set( %Crypt,
     RejectOnBadData           => 1,
 
     AllowEncryptDataInDB      => 0,
+
+    Dashboards => {
+        Encrypt => 0,
+        Sign    => 0,
+    },
 );
 
 =head2 SMIME configuration
diff --git a/lib/RT/Dashboard/Mailer.pm b/lib/RT/Dashboard/Mailer.pm
index 8558978..a02df19 100644
--- a/lib/RT/Dashboard/Mailer.pm
+++ b/lib/RT/Dashboard/Mailer.pm
@@ -348,6 +348,7 @@ sub EmailDashboard {
     $RT::Logger->debug('Mailing dashboard "'.$dashboard->Name.'" to user '.$currentuser->Name." <$email>");
 
     my $ok = RT::Interface::Email::SendEmail(
+        %{ RT->Config->Get('Crypt')->{'Dashboards'} || {} },
         Entity => $entity,
     );
 

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