Bugzilla BZ 443413, 443417

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@224 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

7 files changed, 18 insertions, 7 deletions

diff --git a/pki/base/ca/shared/emails/certIssued_CA b/pki/base/ca/shared/emails/certIssued_CA
index 3539ceaf3..af2d2de9c 100644
--- a/pki/base/ca/shared/emails/certIssued_CA
+++ b/pki/base/ca/shared/emails/certIssued_CA
@@ -6,7 +6,7 @@ notBefore= $NotBefore
 Serial Number= 0x$HexSerialNumber
 
 To get your certificate, please follow this URL:
-https://$HttpHost:$HttpPort/displayBySerial?op=displayBySerial&serialNumber=$SerialNumber
+https://$HttpHost:$HttpPort/ca/ee/ca/displayBySerial?serialNumber=$SerialNumber
 
 Please contact your admin if there is any problem.
 And, of course, this is just a \$SAMPLE\$ email notification form.
diff --git a/pki/base/ca/shared/emails/certIssued_CA.html b/pki/base/ca/shared/emails/certIssued_CA.html
index 36ed04376..b380346ac 100644
--- a/pki/base/ca/shared/emails/certIssued_CA.html
+++ b/pki/base/ca/shared/emails/certIssued_CA.html
@@ -10,7 +10,7 @@ notBefore= <b>$NotBefore</b><br>
 Serial Number= <b>0x$HexSerialNumber</b><p>
 <p>
 To get your certificate, please follow this
-<A HREF="https://$HttpHost:$HttpPort/displayBySerial?op=displayBySerial&serialNumber=$SerialNumber">URL</A>
+<A HREF="https://$HttpHost:$HttpPort/ca/ee/ca/displayBySerial?serialNumber=$SerialNumber">URL</A>
 
 Please contact your admin if there is any problem.
 </body>
diff --git a/pki/base/ca/shared/emails/reqInQueue_CA b/pki/base/ca/shared/emails/reqInQueue_CA
index 072d6f6a8..7916ba5b4 100644
--- a/pki/base/ca/shared/emails/reqInQueue_CA
+++ b/pki/base/ca/shared/emails/reqInQueue_CA
@@ -2,4 +2,4 @@ Request $RequestId is in queue.
 requestor email is $RequestorEmail.
 cert type is $CertType.
 request type is $RequestType.
-request process url: https://$HttpHost:$HttpPort/ca/processReq?seqNum=$RequestId
+request process url: https://$HttpHost:$HttpPort/ca/agent/ca/profileReview?requestId=$RequestId
diff --git a/pki/base/ca/shared/emails/reqInQueue_CA.html b/pki/base/ca/shared/emails/reqInQueue_CA.html
index e8791efb6..3ccaac1fe 100644
--- a/pki/base/ca/shared/emails/reqInQueue_CA.html
+++ b/pki/base/ca/shared/emails/reqInQueue_CA.html
@@ -6,7 +6,7 @@ requestor email is <b>$RequestorEmail</b>.<p>
 cert type is <b>$CertType</b>.<p>
 request type is <b>$RequestType</b>.<p>
 Click 
-<a href="https://$HttpHost:$HttpPort/ca/processReq?seqNum=$RequestId">
+<a href="https://$HttpHost:$HttpPort/ca/agent/ca/profileReview?requestId=$RequestId">
 this URL</a> to process request
 </body>
 </html>
diff --git a/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
index 42752ad56..37e53d96f 100644
--- a/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
+++ b/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
@@ -28,6 +28,7 @@ import com.netscape.certsrv.notification.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.certsrv.apps.*;
 import com.netscape.cms.profile.input.SubjectNameInput;
+import com.netscape.cms.profile.input.SubmitterInfoInput;
 
 import java.io.IOException;
 import java.util.*;
@@ -195,7 +196,13 @@ public class RequestInQListener implements IRequestListener {
         if (profileId == null) {
           val = r.getExtDataInString(IRequest.HTTP_PARAMS, "csrRequestorEmail");
         } else {
-          val = r.getExtDataInString(SubjectNameInput.VAL_EMAIL);
+          // use the submitter info if available, otherwise, use the 
+          // subject name input email 
+          val = r.getExtDataInString(SubmitterInfoInput.EMAIL);
+
+          if ((val == null) || (((String) val).compareTo("") == 0)) {
+              val = r.getExtDataInString(SubjectNameInput.VAL_EMAIL);
+          }
         }
         if (val != null)
             mContentParams.put(IEmailFormProcessor.TOKEN_REQUESTOR_EMAIL,
diff --git a/pki/dogtag/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec
index 4cac4eac6..74a22e983 100644
--- a/pki/dogtag/ca/pki-ca.spec
+++ b/pki/dogtag/ca/pki-ca.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      21
+%define base_release      22
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -278,6 +278,8 @@ fi
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Ade Lee <alee@redhat.com> 1.0.0-22
+- Bugzilla Bug 443413 - Email response template contains wrong link
 * Tue Jan 27 2009 Ade Lee <alee@redhat.com> 1.0.0-21
 - Bugzilla Bug 480679 - Integrate selinux into framework
 * Thu Jan 22 2009 Christina Fu <cfu@redhat.com> 1.0.0-20
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index 3c93d0c09..c230bfd16 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      36
+%define base_release      37
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -280,6 +280,8 @@ chmod 00755 %{_datadir}/%{base_prefix}/setup/postinstall
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Ade Lee <alee@redhat.com> 1.0.0-37
+- Bugzilla Bug: 443417 - requestor email does not make it to mail 
 * Mon Feb 2 2009 Ade Lee <alee@redhat.com> 1.0.0-36
 - Bugzilla Bug: 482761 - additional changes to get cloning working
 * Fri Jan 30 2009 Ade Lee <alee@redhat.com> 1.0.0-35