[Rt-commit] r9574 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Tue Nov  6 07:04:57 2007
New Revision: 9574

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowGnuPGStatus

Log:
 r9310 at cubic-pc (orig r9309):  sartak | 2007-10-16 00:28:45 +0400
  r43699 at onn:  sartak | 2007-10-15 16:28:21 -0400
  Don't show "message is unsigned" warnings for mail generated by RT
 


Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowGnuPGStatus
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowGnuPGStatus	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowGnuPGStatus	Tue Nov  6 07:04:57 2007
@@ -67,7 +67,12 @@
         require RT::Crypt::GnuPG;
         push @runs, [ RT::Crypt::GnuPG::ParseStatus( $_ ) ];
     }
+
     $needs_unsigned_warning = 0 if /^X-RT-Incoming-Signature:/;
+
+    # if this is set, then the email is generated by RT, and so we don't
+    # need "email is unsigned" warnings
+    $needs_unsigned_warning = 0 if /^X-RT-Loop-Prevention:/;
 }
 
 return unless @runs or $needs_unsigned_warning;
@@ -116,6 +121,7 @@
         for ( @status ) {
             if ( $_->{'Operation'} eq 'Verify' && $_->{'Status'} eq 'DONE' ) {
                 $top->AddHeader( 'X-RT-Incoming-Signature' => $_->{'UserString'} );
+                $needs_unsigned_warning = 0;
             }
         }
     }