[Rt-commit] r19501 - in rt/3.999/trunk: . lib/RT lib/RT/Crypt lib/RT/Interface lib/RT/Interface/Web lib/RT/ScripAction share/html/Admin/Elements share/html/Admin/Queues share/html/Admin/Users share/html/Elements/GnuPG share/html/Elements/RT__Model__Ticket share/html/Prefs share/html/Ticket/Elements t/mail t/web

sunnavy at bestpractical.com sunnavy at bestpractical.com
Thu May 7 03:07:09 EDT 2009


Author: sunnavy
Date: Thu May  7 03:07:08 2009
New Revision: 19501

Modified:
   rt/3.999/trunk/   (props changed)
   rt/3.999/trunk/lib/RT/Bootstrap.pm
   rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm
   rt/3.999/trunk/lib/RT/Interface/Email.pm
   rt/3.999/trunk/lib/RT/Interface/Web/Handler.pm
   rt/3.999/trunk/lib/RT/Model/Attachment.pm
   rt/3.999/trunk/lib/RT/Model/User.pm
   rt/3.999/trunk/lib/RT/ScripAction/SendEmail.pm
   rt/3.999/trunk/lib/RT/Test.pm
   rt/3.999/trunk/share/html/Admin/Elements/UserTabs
   rt/3.999/trunk/share/html/Admin/Queues/Modify.html
   rt/3.999/trunk/share/html/Admin/Users/GnuPG.html
   rt/3.999/trunk/share/html/Elements/GnuPG/SelectKeyForSigning
   rt/3.999/trunk/share/html/Elements/GnuPG/SignEncryptWidget
   rt/3.999/trunk/share/html/Elements/RT__Model__Ticket/ColumnMap
   rt/3.999/trunk/share/html/Prefs/Other.html
   rt/3.999/trunk/share/html/Ticket/Elements/ShowTransaction
   rt/3.999/trunk/t/mail/crypt-gnupg.t
   rt/3.999/trunk/t/mail/gnupg-bad.t
   rt/3.999/trunk/t/mail/gnupg-incoming.t
   rt/3.999/trunk/t/mail/gnupg-realmail.t
   rt/3.999/trunk/t/mail/gnupg-reverification.t
   rt/3.999/trunk/t/web/crypt-gnupg.t
   rt/3.999/trunk/t/web/gnupg-outgoing.t
   rt/3.999/trunk/t/web/gnupg-select-keys-on-create.t
   rt/3.999/trunk/t/web/gnupg-select-keys-on-update.t

Log:
 r20345 at sunnavys-mb (orig r18808):  sunnavy | 2009-03-16 12:44:22 +0800
 gnu_pg => gnupg


Modified: rt/3.999/trunk/lib/RT/Bootstrap.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Bootstrap.pm	(original)
+++ rt/3.999/trunk/lib/RT/Bootstrap.pm	Thu May  7 03:07:08 2009
@@ -85,12 +85,12 @@
         'forward_from_user'            => 0,
         'friendly_from_line_format'    => '"%s via RT" <%s>',
         'friendly_to_line_format'      => '"%s of {{rtname}} Ticket #%s":;',
-        'gnu_pg'                       => {
+        'gnupg'                       => {
             enable                   => 1,
             outgoing_messages_format => 'RFC',    # Inline
             allow_encrypt_data_in_db => 0,
         },
-        'gnu_pg_options' => {
+        'gnupg_options' => {
 
             #    homedir => '/home/jesse/svk/3.999-DANGEROUS/var/data/gpg',
 

Modified: rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm	(original)
+++ rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm	Thu May  7 03:07:08 2009
@@ -411,7 +411,7 @@
             Email::Address->parse( $entity->head->get($_) ), qw(To Cc Bcc) ];
     }
 
-    my $format = lc RT->config->get('gnu_pg')->{'outgoing_messages_format'}
+    my $format = lc RT->config->get('gnupg')->{'outgoing_messages_format'}
         || 'RFC';
     if ( $format eq 'inline' ) {
         return sign_encrypt_inline(%args);
@@ -435,7 +435,7 @@
     );
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
 
     # handling passphrase in GnuPGOptions
     $args{'passphrase'} = delete $opt{'passphrase'}
@@ -624,7 +624,7 @@
     return unless $args{'sign'} || $args{'encrypt'};
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
 
     # handling passphrase in GnupGOptions
     $args{'passphrase'} = delete $opt{'passphrase'}
@@ -716,7 +716,7 @@
     return unless $args{'sign'} || $args{'encrypt'};
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
 
     # handling passphrase in GnupGOptions
     $args{'passphrase'} = delete $opt{'passphrase'}
@@ -821,7 +821,7 @@
     return unless $args{'sign'} || $args{'encrypt'};
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
 
     # handling passphrase in GnupGOptions
     $args{'passphrase'} = delete $opt{'passphrase'}
@@ -1072,7 +1072,7 @@
     my %args = ( data => undef, signature => undef, top => undef, @_ );
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
     $opt{'digest-algo'} ||= 'SHA1';
     $gnupg->options->hash_init( _prepare_gnupg_options(%opt), meta_interactive => 0, );
 
@@ -1119,7 +1119,7 @@
     my %args = ( data => undef, signature => undef, top => undef, @_ );
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
     $opt{'digest-algo'} ||= 'SHA1';
     $gnupg->options->hash_init( _prepare_gnupg_options(%opt), meta_interactive => 0, );
 
@@ -1172,7 +1172,7 @@
     );
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
 
     # handling passphrase in GnupGOptions
     $args{'passphrase'} = delete $opt{'passphrase'}
@@ -1249,7 +1249,7 @@
         @_
     );
     my $gnupg = new GnuPG::Interface;
-    my %opt = %{RT->config->get('gnu_pg_options')};
+    my %opt = %{RT->config->get('gnupg_options')};
 
     # handling passphrase in GnuPGOptions
     $args{'passphrase'} = delete $opt{'passphrase'}
@@ -1381,7 +1381,7 @@
     );
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
 
     # handling passphrase in GnuPGOptions
     $args{'passphrase'} = delete $opt{'passphrase'}
@@ -1429,7 +1429,7 @@
     );
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
 
     # handling passphrase in GnuPGOptions
     $args{'passphrase'} = delete $opt{'passphrase'}
@@ -2033,7 +2033,7 @@
     }
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
 
     $opt{'digest-algo'} ||= 'SHA1';
     $opt{'with-colons'}     = undef;    # parseable format
@@ -2088,7 +2088,7 @@
 sub parse_keys_info {
     my @lines = @_;
 
-    my %gpg_opt = %{RT->config->get('gnu_pg_options')};
+    my %gpg_opt = %{RT->config->get('gnupg_options')};
 
     my @res = ();
     foreach my $line (@lines) {
@@ -2235,7 +2235,7 @@
     my $key = shift;
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
     $gnupg->options->hash_init( _prepare_gnupg_options(%opt), meta_interactive => 0, );
 
     my ( $handles, $handle_list ) = _make_gpg_handles();
@@ -2285,7 +2285,7 @@
     my $key = shift;
 
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
     $gnupg->options->hash_init( _prepare_gnupg_options(%opt), meta_interactive => 0, );
 
     my ( $handles, $handle_list ) = _make_gpg_handles();
@@ -2369,7 +2369,7 @@
 
 sub probe {
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
     $gnupg->options->hash_init(
         _prepare_gnupg_options(%opt),
         armor            => 1,

Modified: rt/3.999/trunk/lib/RT/Interface/Email.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Interface/Email.pm	(original)
+++ rt/3.999/trunk/lib/RT/Interface/Email.pm	Thu May  7 03:07:08 2009
@@ -335,7 +335,7 @@
         $args{'ticket'} = $args{'transaction'}->object;
     }
 
-    if ( RT->config->get('gnu_pg')->{'enable'} ) {
+    if ( RT->config->get('gnupg')->{'enable'} ) {
         my %crypt;
 
         my $attachment;

Modified: rt/3.999/trunk/lib/RT/Interface/Web/Handler.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Interface/Web/Handler.pm	(original)
+++ rt/3.999/trunk/lib/RT/Interface/Web/Handler.pm	Thu May  7 03:07:08 2009
@@ -96,7 +96,7 @@
     require RT::ScripAction::SendEmail;
     RT::ScripAction::SendEmail->clean_slate;
 
-    if ( RT->config->get('gnu_pg')->{'enable'} ) {
+    if ( RT->config->get('gnupg')->{'enable'} ) {
         require RT::Crypt::GnuPG;
         RT::Crypt::GnuPG::use_key_for_encryption();
         RT::Crypt::GnuPG::use_key_for_signing(undef);

Modified: rt/3.999/trunk/lib/RT/Model/Attachment.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/Attachment.pm	(original)
+++ rt/3.999/trunk/lib/RT/Model/Attachment.pm	Thu May  7 03:07:08 2009
@@ -634,9 +634,9 @@
     return ( 0, _('Permission Denied') )
         unless $txn->ticket->current_user_has_right('ModifyTicket');
     return ( 0, _('GnuPG integration is disabled') )
-        unless RT->config->get('gnu_pg')->{'enable'};
+        unless RT->config->get('gnupg')->{'enable'};
     return ( 0, _('Attachments encryption is disabled') )
-        unless RT->config->get('gnu_pg')->{'allow_encrypt_data_in_db'};
+        unless RT->config->get('gnupg')->{'allow_encrypt_data_in_db'};
 
     require RT::Crypt::GnuPG;
 
@@ -691,7 +691,7 @@
     return ( 0, _('Permission Denied') )
         unless $txn->ticket->current_user_has_right('ModifyTicket');
     return ( 0, _('GnuPG integration is disabled') )
-        unless RT->config->get('gnu_pg')->{'enable'};
+        unless RT->config->get('gnupg')->{'enable'};
 
     require RT::Crypt::GnuPG;
 

Modified: rt/3.999/trunk/lib/RT/Model/User.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/User.pm	(original)
+++ rt/3.999/trunk/lib/RT/Model/User.pm	Thu May  7 03:07:08 2009
@@ -1274,7 +1274,7 @@
 
 sub preferred_key {
     my $self = shift;
-    return undef unless RT->config->get('gnu_pg')->{'enable'};
+    return undef unless RT->config->get('gnupg')->{'enable'};
     my $prefkey = $self->first_attribute('preferred_key');
     return $prefkey->content if $prefkey;
 

Modified: rt/3.999/trunk/lib/RT/ScripAction/SendEmail.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/ScripAction/SendEmail.pm	(original)
+++ rt/3.999/trunk/lib/RT/ScripAction/SendEmail.pm	Thu May  7 03:07:08 2009
@@ -105,7 +105,7 @@
 
     my $orig_message;
     if (   RT->config->get('record_outgoing_email')
-        && RT->config->get('gnu_pg')->{'enable'} )
+        && RT->config->get('gnupg')->{'enable'} )
     {
 
         # it's hacky, but we should know if we're going to crypt things

Modified: rt/3.999/trunk/lib/RT/Test.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Test.pm	(original)
+++ rt/3.999/trunk/lib/RT/Test.pm	Thu May  7 03:07:08 2009
@@ -617,7 +617,7 @@
     require RT::Crypt::GnuPG;
     require GnuPG::Interface;
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
     $gnupg->options->hash_init( RT::Crypt::GnuPG::_prepare_gnupg_options(%opt), meta_interactive => 0, );
 
     my %handle;
@@ -675,7 +675,7 @@
     require RT::Crypt::GnuPG;
     require GnuPG::Interface;
     my $gnupg = new GnuPG::Interface;
-    my %opt   = %{RT->config->get('gnu_pg_options')};
+    my %opt   = %{RT->config->get('gnupg_options')};
     $gnupg->options->hash_init( RT::Crypt::GnuPG::_prepare_gnupg_options(%opt), meta_interactive => 0, );
 
     my %handle;

Modified: rt/3.999/trunk/share/html/Admin/Elements/UserTabs
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Elements/UserTabs	(original)
+++ rt/3.999/trunk/share/html/Admin/Elements/UserTabs	Thu May  7 03:07:08 2009
@@ -71,7 +71,7 @@
 			 },
 	}
 };
-    if ( RT->config->get('gnu_pg')->{'enable'} ) {
+    if ( RT->config->get('gnupg')->{'enable'} ) {
         $tabs->{'this'}{'subtabs'}{'GnuPG'} = {
             title => _('GnuPG'),
             path  => "Admin/Users/GnuPG.html?id=".$id,

Modified: rt/3.999/trunk/share/html/Admin/Queues/Modify.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Queues/Modify.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Queues/Modify.html	Thu May  7 03:07:08 2009
@@ -105,7 +105,7 @@
 </td></tr>
 % }
 
-% if ( RT->config->get('gnu_pg')->{'enable'} ) {
+% if ( RT->config->get('gnupg')->{'enable'} ) {
 <tr><td align="right"><input type="checkbox" class="checkbox" name="sign" value="1" <% $queue_obj->sign? 'checked="checked"': '' |n%> /></td>
 <td><&|/l&>sign by default</&></td>
 <td align="right"><input type="checkbox" class="checkbox" name="encrypt" value="1" <% $queue_obj->encrypt? 'checked="checked"': '' |n%> /></td>
@@ -119,7 +119,7 @@
 % $m->callback( %ARGS, queue_obj => $queue_obj, results => \@results );
 </td></tr>
 
-% if ( RT->config->get('gnu_pg')->{'enable'} ) {
+% if ( RT->config->get('gnupg')->{'enable'} ) {
 % if ( my $email = $queue_obj->correspond_address || RT->config->get('correspond_address') ) {
 <tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, type => 'private', email => $email &></td></tr>
 % }

Modified: rt/3.999/trunk/share/html/Admin/Users/GnuPG.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Users/GnuPG.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Users/GnuPG.html	Thu May  7 03:07:08 2009
@@ -82,7 +82,7 @@
 $update     => undef
 </%ARGS>
 <%INIT>
-return unless RT->config->get('gnu_pg')->{'enable'};
+return unless RT->config->get('gnupg')->{'enable'};
 
 require RT::Crypt::GnuPG;
 

Modified: rt/3.999/trunk/share/html/Elements/GnuPG/SelectKeyForSigning
==============================================================================
--- rt/3.999/trunk/share/html/Elements/GnuPG/SelectKeyForSigning	(original)
+++ rt/3.999/trunk/share/html/Elements/GnuPG/SelectKeyForSigning	Thu May  7 03:07:08 2009
@@ -59,7 +59,7 @@
 $user => undef,
 </%ARGS>
 <%INIT>
-return unless RT->config->get('gnu_pg')->{'enable'};
+return unless RT->config->get('gnupg')->{'enable'};
 
 my $user_key = $user->private_key;
 </%INIT>

Modified: rt/3.999/trunk/share/html/Elements/GnuPG/SignEncryptWidget
==============================================================================
--- rt/3.999/trunk/share/html/Elements/GnuPG/SignEncryptWidget	(original)
+++ rt/3.999/trunk/share/html/Elements/GnuPG/SignEncryptWidget	Thu May  7 03:07:08 2009
@@ -66,7 +66,7 @@
 $arguments => {}
 </%ARGS>
 <%INIT>
-return undef unless RT->config->get('gnu_pg')->{'enable'};
+return undef unless RT->config->get('gnupg')->{'enable'};
 
 require RT::Crypt::GnuPG;
 return { %$arguments };

Modified: rt/3.999/trunk/share/html/Elements/RT__Model__Ticket/ColumnMap
==============================================================================
--- rt/3.999/trunk/share/html/Elements/RT__Model__Ticket/ColumnMap	(original)
+++ rt/3.999/trunk/share/html/Elements/RT__Model__Ticket/ColumnMap	Thu May  7 03:07:08 2009
@@ -333,7 +333,7 @@
 
 # if no GPG support, then key_owner_name and key_requestors fall back to the regular
 # versions
-if (RT->config->get('gnu_pg')->{'enable'}) {
+if (RT->config->get('gnupg')->{'enable'}) {
     require RT::Crypt::GnuPG;
 }
 else {

Modified: rt/3.999/trunk/share/html/Prefs/Other.html
==============================================================================
--- rt/3.999/trunk/share/html/Prefs/Other.html	(original)
+++ rt/3.999/trunk/share/html/Prefs/Other.html	Thu May  7 03:07:08 2009
@@ -69,7 +69,7 @@
 </&>
 % }
 
-% if ( RT->config->get('gnu_pg')->{'enable'} ) {
+% if ( RT->config->get('gnupg')->{'enable'} ) {
 <&|/Widgets/TitleBox, title => _( 'Cryptography' ) &>
 <&|/l&>Preferred key</&>: <& /Elements/GnuPG/SelectKeyForEncryption, email => $user_object->email, default => $user_object->preferred_key &>
 </&>

Modified: rt/3.999/trunk/share/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/ShowTransaction	(original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/ShowTransaction	Thu May  7 03:07:08 2009
@@ -66,7 +66,7 @@
 
     <div class="content">
 % if ( $attachments->[0] && $attachments->[0]->id ) {
-%   if (RT->config->get('gnu_pg')->{'enable'}) {
+%   if (RT->config->get('gnupg')->{'enable'}) {
         <& ShowGnuPGStatus, attachment => $attachments->[0], warn_unsigned => $warn_unsigned &>
 %   }
 % }
@@ -206,8 +206,8 @@
               . "\">". _('Forward') . "</a>]";
         }
         if ( $can_modify
-            && RT->config->get('gnu_pg')->{'enable'}
-            && RT->config->get('gnu_pg')->{'allow_encrypt_data_in_db'}
+            && RT->config->get('gnupg')->{'enable'}
+            && RT->config->get('gnupg')->{'allow_encrypt_data_in_db'}
             && $ticket->current_user_has_right('ForwardMessage')
         ) {
             $titlebar_commands .=

Modified: rt/3.999/trunk/t/mail/crypt-gnupg.t
==============================================================================
--- rt/3.999/trunk/t/mail/crypt-gnupg.t	(original)
+++ rt/3.999/trunk/t/mail/crypt-gnupg.t	Thu May  7 03:07:08 2009
@@ -23,7 +23,7 @@
 use_ok('MIME::Entity');
 
 RT->config->set(
-    'gnu_pg',
+    'gnupg',
     {
         enable                   => 1,
         outgoing_messages_format => 'RFC',
@@ -31,7 +31,7 @@
 );
 
 RT->config->set(
-    'gnu_pg_options',
+    'gnupg_options',
     {
         homedir                 => $homedir,
         'no-permission-warning' => undef,

Modified: rt/3.999/trunk/t/mail/gnupg-bad.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-bad.t	(original)
+++ rt/3.999/trunk/t/mail/gnupg-bad.t	Thu May  7 03:07:08 2009
@@ -18,7 +18,7 @@
     qw(data gnupg keyrings));
 
 RT->config->set(
-    'gnu_pg',
+    'gnupg',
     {
         enable                   => 1,
         outgoing_messages_format => 'RFC',
@@ -26,7 +26,7 @@
 );
 
 RT->config->set(
-    'gnu_pg_options',
+    'gnupg_options',
     {
         homedir                 => $homedir,
         passphrase              => 'test',

Modified: rt/3.999/trunk/t/mail/gnupg-incoming.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-incoming.t	(original)
+++ rt/3.999/trunk/t/mail/gnupg-incoming.t	Thu May  7 03:07:08 2009
@@ -24,7 +24,7 @@
 
 
 RT->config->set(
-    'gnu_pg',
+    'gnupg',
     {
         enable                   => 1,
         outgoing_messages_format => 'RFC',
@@ -32,7 +32,7 @@
 );
 
 RT->config->set(
-    'gnu_pg_options',
+    'gnupg_options',
     {
         homedir                 => $homedir,
         'no-permission-warning' => undef

Modified: rt/3.999/trunk/t/mail/gnupg-realmail.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-realmail.t	(original)
+++ rt/3.999/trunk/t/mail/gnupg-realmail.t	Thu May  7 03:07:08 2009
@@ -19,7 +19,7 @@
 my $homedir = tempdir( CLEANUP => 1 );
 
 RT->config->set(
-    'gnu_pg',
+    'gnupg',
     {
         enable                   => 1,
         outgoing_messages_format => 'RFC',
@@ -27,7 +27,7 @@
 );
 
 RT->config->set(
-    'gnu_pg_options',
+    'gnupg_options',
     {
         homedir                 => $homedir,
         passphrase              => 'rt-test',

Modified: rt/3.999/trunk/t/mail/gnupg-reverification.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-reverification.t	(original)
+++ rt/3.999/trunk/t/mail/gnupg-reverification.t	Thu May  7 03:07:08 2009
@@ -17,7 +17,7 @@
 my $homedir = tempdir( CLEANUP => 1 );
 
 RT->config->set(
-    'gnu_pg',
+    'gnupg',
     {
         enable                   => 1,
         outgoing_messages_format => 'RFC',
@@ -25,7 +25,7 @@
 );
 
 RT->config->set(
-    'gnu_pg_options',
+    'gnupg_options',
     {
         homedir                 => $homedir,
         passphrase              => 'rt-test',

Modified: rt/3.999/trunk/t/web/crypt-gnupg.t
==============================================================================
--- rt/3.999/trunk/t/web/crypt-gnupg.t	(original)
+++ rt/3.999/trunk/t/web/crypt-gnupg.t	Thu May  7 03:07:08 2009
@@ -35,7 +35,7 @@
 use_ok('RT::Crypt::GnuPG');
 
 RT->config->set(
-    'gnu_pg',
+    'gnupg',
     {
         enable                   => 1,
         outgoing_messages_format => 'RFC',
@@ -43,7 +43,7 @@
 );
 
 RT->config->set(
-    'gnu_pg_options',
+    'gnupg_options',
     {
         homedir                 => $homedir,
         passphrase              => 'recipient',

Modified: rt/3.999/trunk/t/web/gnupg-outgoing.t
==============================================================================
--- rt/3.999/trunk/t/web/gnupg-outgoing.t	(original)
+++ rt/3.999/trunk/t/web/gnupg-outgoing.t	Thu May  7 03:07:08 2009
@@ -20,14 +20,14 @@
 use_ok('RT::Crypt::GnuPG');
 
 RT->config->set(
-    gnu_pg => {
+    gnupg => {
         enable                   => 1,
         outgoing_messages_format => 'RFC',
     }
 );
 
 RT->config->set(
-    gnu_pg_options => {
+    gnupg_options => {
         homedir                 => scalar tempdir( CLEANUP => 1 ),
         passphrase              => 'rt-test',
         'no-permission-warning' => undef,
@@ -150,7 +150,7 @@
 # like we are on another side recieve emails
 # ------------------------------------------------------------------------------
 
-unlink $_ foreach glob( RT->config->get('gnu_pg_options')->{'homedir'} ."/*" );
+unlink $_ foreach glob( RT->config->get('gnupg_options')->{'homedir'} ."/*" );
 RT::Test->import_gnupg_key('rt-recipient at example.com', 'public');
 RT::Test->import_gnupg_key('rt-test at example.com');
 

Modified: rt/3.999/trunk/t/web/gnupg-select-keys-on-create.t
==============================================================================
--- rt/3.999/trunk/t/web/gnupg-select-keys-on-create.t	(original)
+++ rt/3.999/trunk/t/web/gnupg-select-keys-on-create.t	Thu May  7 03:07:08 2009
@@ -20,20 +20,20 @@
 use_ok('RT::Crypt::GnuPG');
 
 RT->config->set(
-    gnu_pg => {
+    gnupg => {
         enable                   => 1,
         outgoing_messages_format => 'RFC',
     }
 );
 
 RT->config->set(
-    gnu_pg_options => {
+    gnupg_options => {
         homedir                 => scalar tempdir( CLEANUP => 0 ),
         passphrase              => 'rt-test',
         'no-permission-warning' => undef,
     }
 );
-diag "GnuPG --homedir ". RT->config->get('gnu_pg_options')->{'homedir'} if $ENV{TEST_VERBOSE};
+diag "GnuPG --homedir ". RT->config->get('gnupg_options')->{'homedir'} if $ENV{TEST_VERBOSE};
 
 RT->config->set( 'mail_plugins' => [ 'Auth::MailFrom', 'Auth::GnuPG' ] );
 

Modified: rt/3.999/trunk/t/web/gnupg-select-keys-on-update.t
==============================================================================
--- rt/3.999/trunk/t/web/gnupg-select-keys-on-update.t	(original)
+++ rt/3.999/trunk/t/web/gnupg-select-keys-on-update.t	Thu May  7 03:07:08 2009
@@ -20,20 +20,20 @@
 use_ok('RT::Crypt::GnuPG');
 
 RT->config->set(
-    gnu_pg => {
+    gnupg => {
         enable                   => 1,
         outgoing_messages_format => 'RFC',
     }
 );
 
 RT->config->set(
-    gnu_pg_options => {
+    gnupg_options => {
         homedir                 => scalar tempdir( CLEANUP => 0 ),
         passphrase              => 'rt-test',
         'no-permission-warning' => undef,
     }
 );
-diag "GnuPG --homedir ". RT->config->get('gnu_pg_options')->{'homedir'} if $ENV{TEST_VERBOSE};
+diag "GnuPG --homedir ". RT->config->get('gnupg_options')->{'homedir'} if $ENV{TEST_VERBOSE};
 
 RT->config->set( 'mail_plugins' => [ 'Auth::MailFrom', 'Auth::GnuPG' ] );
 


More information about the Rt-commit mailing list