[Rt-commit] r9358 - in rtir/branches/2.3-EXPERIMENTAL: . html/RTIR

[sartak at bestpractical.com]

Author: sartak
Date: Fri Oct 19 13:14:05 2007
New Revision: 9358

Modified:
   rtir/branches/2.3-EXPERIMENTAL/   (props changed)
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Update.html

Log:
 r43881 at onn:  sartak | 2007-10-19 13:13:58 -0400
 Get rid of GnuPGSignIssues


Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html	Fri Oct 19 13:14:05 2007
@@ -69,11 +69,7 @@
 
 <a name="top"></a>
 
-% if ($cannot_sign) {
-<& /Elements/GnuPGSignIssues &>
-% }
-
-<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues &>
+<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues, SignAddresses => \@cannot_sign_as &>
 
 <&| /Widgets/TitleBox, contentbg => "#cccccc", title => $Title &>
 <table border="0" cellpadding="0" cellspacing="2">
@@ -412,10 +408,11 @@
 push @results, $m->comp( 'SELF:ProcessAttachments', %ARGS );
 
 # check to see if we have a good passphrase
-my $cannot_sign = 0;
+my @cannot_sign_as;
 if ( $ARGS{'Create'} && $ARGS{'Sign'} ) {
-    if (!RT::Crypt::GnuPG::DrySign($QueueObj->CorrespondAddress, "x")) {
-        $cannot_sign = 1;
+    my $address = $QueueObj->CorrespondAddress;
+    if (!RT::Crypt::GnuPG::DrySign($address, "x")) {
+        push @cannot_sign_as, $address;
         $checks_failure = 1;
     }
 }

Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html	Fri Oct 19 13:14:05 2007
@@ -63,11 +63,7 @@
 % }
 <a name="top" />
 
-% if ($cannot_sign) {
-<& /Elements/GnuPGSignIssues &>
-% }
-
-<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues &>
+<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues, SignAddresses => \@cannot_sign_as &>
 
 <&| /Widgets/TitleBox, title => $Title &>
 <table border="0" cellpadding="0" cellspacing="2">
@@ -238,11 +234,11 @@
 
 my $checks_failure = 0;
 
-my $cannot_sign = 0;
+my @cannot_sign_as;
 if ( $CreateIncident && $ARGS{'Sign'} ) {
     my $address = $Ticket->QueueObj->CorrespondAddress;
     if (!RT::Crypt::GnuPG::DrySign($address, "x")) {
-        $cannot_sign = 1;
+        push @cannot_sign_as, $address;
         $checks_failure = 1;
     }
 }

Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html	Fri Oct 19 13:14:05 2007
@@ -45,11 +45,7 @@
 <input type="hidden" name="All" value="<% $All %>" />
 <input type="hidden" name="Query" value="<% $Query %>" />
 
-% if (defined $cannot_sign_to) {
-<& /Elements/GnuPGSignIssues, Address => $cannot_sign_to &>
-% }
-
-<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues &>
+<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues, SignAddresses => \@cannot_sign_as &>
 
 % my $recipients = 0;
 
@@ -160,7 +156,7 @@
 my $checks_failure = 0;
 
 my %sign_addresses;
-my $cannot_sign_to;
+my @cannot_sign_as;
 $sign_address{ $IncidentObj->QueueObj->CorrespondAddress } = 1;
 
 my @gnupg_keys_issues;
@@ -199,9 +195,8 @@
 if ( $SubmitTicket && $ARGS{'Sign'} ) {
     for my $address (keys %sign_address) {
         if (!RT::Crypt::GnuPG::DrySign($address, "x")) {
-            $cannot_sign_to = $address;
+            push @cannot_sign_as, $address;
             $checks_failure = 1;
-            last;
         }
     }
 }

Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Update.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Update.html	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Update.html	Fri Oct 19 13:14:05 2007
@@ -40,11 +40,7 @@
 <input type="hidden" name="Action" value="<% $Action || '' %>" />
 <input type="hidden" name="TakeOrStealFirst" value="<% $ARGS{TakeOrStealFirst} || '' %>" />
 
-% if ($cannot_sign) {
-<& /Elements/GnuPGSignIssues &>
-% }
-
-<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues &>
+<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues, SignAddresses => \@cannot_sign_as &>
 
 <table>
 <tr><td><a href="Edit.html?id=<% $id %>"><&|/l&>Correspondents</&></a></td><td align="right" colspan=2></td></tr>
@@ -174,13 +170,13 @@
 }
 
 # check to see if we have a good passphrase
-my $cannot_sign = 0;
+my @cannot_sign_as;
 if ( $ARGS{'SubmitTicket'} && $ARGS{'Sign'} ) {
     my $address = $ARGS{'UpdateType'} eq "private"
                 ? $Ticket->QueueObj->CommentAddress
                 : $Ticket->QueueObj->CorrespondAddress;
     if (!RT::Crypt::GnuPG::DrySign($address, "x")) {
-        $cannot_sign = 1;
+        push @cannot_sign_as, $address;
         $checks_failure = 1;
     }
 }