[Rt-commit] rt branch, smime, updated. rt-3.8.7-194-g1833565

[Ruslan Zakirov]

The branch, smime has been updated
       via  18335657ec2330f377d91c3803bdf7b0c5324326 (commit)
      from  37f3e55d95ef826354635d26bcbd5e7c2384813f (commit)

Summary of changes:
 share/html/Elements/GnuPG/SelectKeyForSigning |    7 +++++--
 share/html/Elements/GnuPG/SignEncryptWidget   |    2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 18335657ec2330f377d91c3803bdf7b0c5324326
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Sat Apr 17 04:38:37 2010 +0400

    users' private keys are only supported for GnuPG

diff --git a/share/html/Elements/GnuPG/SelectKeyForSigning b/share/html/Elements/GnuPG/SelectKeyForSigning
index 13b40df..813fc73 100644
--- a/share/html/Elements/GnuPG/SelectKeyForSigning
+++ b/share/html/Elements/GnuPG/SelectKeyForSigning
@@ -58,7 +58,10 @@ $Name => 'SignUsing',
 $User => undef,
 </%ARGS>
 <%INIT>
-return unless RT->Config->Get('GnuPG')->{'Enable'};
+return unless RT->Config->Get('Crypt')->{'Enable'};
 
-my $user_key = $User->PrivateKey;
+# XXX: Only GnuPG at this moment supports user's private keys
+my $user_key;
+$user_key = $User->PrivateKey
+    if RT->Config->Get('Crypt')->{'Outgoing'} eq 'GnuPG';;
 </%INIT>
diff --git a/share/html/Elements/GnuPG/SignEncryptWidget b/share/html/Elements/GnuPG/SignEncryptWidget
index e51ec1d..fe7493a 100644
--- a/share/html/Elements/GnuPG/SignEncryptWidget
+++ b/share/html/Elements/GnuPG/SignEncryptWidget
@@ -48,7 +48,9 @@
 <table>
 <td><% loc('Sign')%></td>
 <td><& /Widgets/Form/Boolean:InputOnly, Name => 'Sign', CurrentValue => $self->{'Sign'} &>
+% if ( RT->Config->Get('Crypt')->{'Outgoing'} eq 'GnuPG' ) {
 using <& SelectKeyForSigning, User => $session{'CurrentUser'}->UserObj &>
+% }
 </td>
 <td><% loc('Encrypt')%></td>
 <td><& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $self->{'Encrypt'} &></td>

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