From 7315a95377ee364d8f14c68ef4a469fc7dae743d Mon Sep 17 00:00:00 2001 From: alee Date: Thu, 12 Feb 2009 01:14:02 +0000 Subject: Bugzilla BZ 443413, 443417 git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@224 c9f7a03b-bd48-0410-a16d-cbbf54688b0b --- .../src/com/netscape/cms/listeners/RequestInQListener.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pki/base/common/src/com') 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, -- cgit