[Rt-commit] r9373 - rt/branches/3.7-RTIR-RELENG/html/Ticket

[ruz at bestpractical.com]

Author: ruz
Date: Fri Oct 19 19:26:58 2007
New Revision: 9373

Modified:
   rt/branches/3.7-RTIR-RELENG/html/Ticket/Create.html
   rt/branches/3.7-RTIR-RELENG/html/Ticket/Update.html

Log:
* Queue's CommentAddress and CorrespondAddress methods may return
  empty values and we must fallback to defaults from the config

Modified: rt/branches/3.7-RTIR-RELENG/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.7-RTIR-RELENG/html/Ticket/Create.html	(original)
+++ rt/branches/3.7-RTIR-RELENG/html/Ticket/Create.html	Fri Oct 19 19:26:58 2007
@@ -326,8 +326,9 @@
 
     # check to see if we have a good passphrase
     if ( $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: rt/branches/3.7-RTIR-RELENG/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.7-RTIR-RELENG/html/Ticket/Update.html	(original)
+++ rt/branches/3.7-RTIR-RELENG/html/Ticket/Update.html	Fri Oct 19 19:26:58 2007
@@ -257,9 +257,11 @@
     # check to see if we have a good passphrase
     if ( $ARGS{'Sign'} ) {
         my $address = $ARGS{'UpdateType'} eq "private"
-                    ? $TicketObj->QueueObj->CommentAddress
-                    : $TicketObj->QueueObj->CorrespondAddress;
-        if (!RT::Crypt::GnuPG::DrySign($address, "x")) {
+            ? ( $TicketObj->QueueObj->CommentAddress
+                || RT->Config->Get('CommentAddress') )
+            : ( $TicketObj->QueueObj->CorrespondAddress
+                || RT->Config->Get('CorrespondAddress') );
+        unless ( RT::Crypt::GnuPG::DrySign($address, "x") ) {
             push @cannot_sign_as, $address;
             $checks_failure = 1;
         }