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

[ruz at bestpractical.com]

Author: ruz
Date: Fri Oct 19 19:36:37 2007
New Revision: 9374

Modified:
   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:
* Queue's CommentAddress and CorrespondAddress methods may return
  empty values and we must fallback to defaults from the config
* if (!...) -> unless (...)

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 19:36:37 2007
@@ -410,8 +410,9 @@
 # check to see if we have a good passphrase
 my @cannot_sign_as;
 if ( $ARGS{'Create'} && $ARGS{'Sign'} ) {
-    my $address = $QueueObj->CorrespondAddress;
-    if (!RT::Crypt::GnuPG::DrySign($address, "x")) {
+    my $address = $QueueObj->CorrespondAddress
+        || RT->Config->Get('CorrespondAddress');
+    unless ( 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 19:36:37 2007
@@ -236,8 +236,8 @@
 
 my @cannot_sign_as;
 if ( $CreateIncident && $ARGS{'Sign'} ) {
-    my $address = $QueueObj->CorrespondAddress;
-    if (!RT::Crypt::GnuPG::DrySign($address, "x")) {
+    my $address = $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress');
+    unless ( RT::Crypt::GnuPG::DrySign($address, "x") ) {
         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 19:36:37 2007
@@ -172,8 +172,11 @@
             next;
         }
 
-        $sign_addresses{ $Ticket->QueueObj->CorrespondAddress } = 1
-            if $ARGS{'Sign'};
+        if ( $ARGS{'Sign'} ) {
+            my $address = $Ticket->QueueObj->CorrespondAddress
+                || RT->Config->Get('CorrespondAddress');
+            $sign_addresses{ $address } = 1;
+        }
 
         push @recipients, $m->comp(
             '/Ticket/Elements/PreviewScrips:GetRecipients',
@@ -194,7 +197,7 @@
 
 if ( $SubmitTicket && $ARGS{'Sign'} ) {
     for my $address (keys %sign_addresses) {
-        if (!RT::Crypt::GnuPG::DrySign($address, "x")) {
+        unless ( RT::Crypt::GnuPG::DrySign($address, "x") ) {
             push @cannot_sign_as, $address;
             $checks_failure = 1;
         }

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 19:36:37 2007
@@ -173,9 +173,12 @@
 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")) {
+        ? ( $Ticket->QueueObj->CommentAddress
+            || RT->Config->Get('CommentAddress') )
+        : ( $Ticket->QueueObj->CorrespondAddress
+            || RT->Config->Get('CorrespondAddress') );
+
+    unless ( RT::Crypt::GnuPG::DrySign($address, "x") ) {
         push @cannot_sign_as, $address;
         $checks_failure = 1;
     }