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

[ruz at bestpractical.com]

Author: ruz
Date: Tue Nov  6 07:08:59 2007
New Revision: 9590

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html

Log:
 r9374 at cubic-pc (orig r9373):  ruz | 2007-10-20 03:26:58 +0400
 * Queue's CommentAddress and CorrespondAddress methods may return
   empty values and we must fallback to defaults from the config


Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html	Tue Nov  6 07:08:59 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-EXPERIMENTAL/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html	Tue Nov  6 07:08:59 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;
         }