You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by mo...@apache.org on 2003/01/26 06:04:03 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html JetspeedQuestionnaire.jsp
morciuch 2003/01/25 21:04:03
Modified: src/java/org/apache/jetspeed/modules/actions/portlets
QuestionnaireAction.java
webapp/WEB-INF/templates/jsp/portlets/html
JetspeedQuestionnaire.jsp
Log:
Modified questionnaire to send email from address defined in mail.support property.
Revision Changes Path
1.2 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/QuestionnaireAction.java
Index: QuestionnaireAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/QuestionnaireAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QuestionnaireAction.java 17 Jan 2003 18:39:54 -0000 1.1
+++ QuestionnaireAction.java 26 Jan 2003 05:04:03 -0000 1.2
@@ -149,7 +149,7 @@
}
String emailSmtp = JetspeedResources.getString(JetspeedResources.MAIL_SERVER_KEY);
- String emailFrom = rundata.getParameters().getString("emailFrom", rundata.getUser().getEmail());
+ String emailFrom = JetspeedResources.getString("mail.support", "david@bluesunrise.com");
String emailTo = rundata.getParameters().getString("emailTo", "jetspeed-dev@jakarta.apache.org");
String emailAttachment = rundata.getRequest().getParameter("emailAttachment");
try
@@ -173,7 +173,7 @@
message.setRecipients(Message.RecipientType.TO, toAddresses);
// Set the subject and text
- message.setSubject("Jetspeed Questionnaire");
+ message.setSubject("Jetspeed Questionnaire from " + rundata.getUser().getEmail());
message.setText(emailText);
// Attach file with message
1.2 +0 -1 jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html/JetspeedQuestionnaire.jsp
Index: JetspeedQuestionnaire.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html/JetspeedQuestionnaire.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedQuestionnaire.jsp 17 Jan 2003 18:39:54 -0000 1.1
+++ JetspeedQuestionnaire.jsp 26 Jan 2003 05:04:03 -0000 1.2
@@ -59,7 +59,6 @@
<p>
<INPUT TYPE="SUBMIT" NAME="eventSubmit_doEmail" VALUE="E-Mail Questionnaire"> to
<INPUT TYPE="TEXT" SIZE="30" NAME="emailTo" VALUE="jetspeed-dev@jakarta.apache.org">
- from <INPUT TYPE="TEXT" SIZE="30" NAME="emailFrom" VALUE="<%=data.getUser().getEmail()%>">
<font COLOR="RED"><B><%=data.getMessage() == null ? "" : data.getMessage()%></B></FONT>
</FORM>
</TD>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>