pvollenweider 2005/06/24 16:45:58 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp/include simple_form_generator_definitions.inc
simple_form_generator_display_form.inc
simple_form_generator_process_post.inc
Log:
Send mail using org.jahia.services.mail.MailService
Revision Changes Path
1.1.2.2 +0 -3
corporate_portal_templates/src/view/jsp/include/simple_form_generator_definitions.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/simple_form_generator_definitions.inc.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.1.2.2 +10 -5
corporate_portal_templates/src/view/jsp/include/simple_form_generator_display_form.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/simple_form_generator_display_form.inc.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.1.2.2 +14 -0
corporate_portal_templates/src/view/jsp/include/simple_form_generator_process_post.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/simple_form_generator_process_post.inc.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
Index: simple_form_generator_definitions.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/simple_form_generator_definitions.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- simple_form_generator_definitions.inc 24 Jun 2005 14:13:17 -0000
1.1.2.1
+++ simple_form_generator_definitions.inc 24 Jun 2005 14:45:58 -0000
1.1.2.2
@@ -10,9 +10,6 @@
bundleKey="<%=resBundleID%>"/>
<content:declareField name="subject" title="Subject"
type="SharedSmallText"
titleKey="form.Subject" bundleKey="<%=resBundleID%>"/>
- <content:declareField name="alertText" title="Alert text for mandatory
fields"
- type="BigText" titleKey="form.alertText" bundleKey="<%=resBundleID%>"
- value=""/>
<content:declareField name="pageRedirected"
title="Page redirected to after submission" type="Page"
titleKey="form.pageRedirected" bundleKey="<%=resBundleID%>"/>
Index: simple_form_generator_display_form.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/simple_form_generator_display_form.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- simple_form_generator_display_form.inc 24 Jun 2005 14:13:17 -0000
1.1.2.1
+++ simple_form_generator_display_form.inc 24 Jun 2005 14:45:58 -0000
1.1.2.2
@@ -6,6 +6,15 @@
null, null, true, "", "jahiatemplates.Corporate_portal_templates",
null, out);
Enumeration formsEnum = forms.getContainers();
boolean isFormOK = false;
+ if (! formsEnum.hasMoreElements()) {
+ if ( ! "".equals(jData.gui().html().drawAddContainerLauncher( forms
)) ) {
+ %>
+ <a
href="javascript:<%=jData.gui().html().drawAddContainerLauncher( forms )%>">
+ <img src='<%=theURL%>/images/add.gif' alt='Add form' width='11'
height='11' border='0'/>
+ Add sender, recipient, ...</a>
+ <%
+ }
+ }
while (formsEnum.hasMoreElements()) {
JahiaContainer form = (JahiaContainer) formsEnum.nextElement();
ContainerBean formBean = new ContainerBean(form,jParams);
@@ -13,9 +22,8 @@
String recipients = form.getFieldValue("recipients","Please insert a
sender");
String recipientsCC = form.getFieldValue("recipientsCC","");
String subject = form.getFieldValue("subject","");
- String alertText = form.getFieldValue("alertText","");
JahiaPage pageRedirected = (JahiaPage)
form.getFieldObject("pageRedirected" );
- isFormOK = ! ("".equals(sender) || "".equals( recipientsCC ));
+ isFormOK = ! ("".equals(sender) || "".equals( recipients ));
if (jData.gui().isEditMode()) {
jData.gui().html().drawBeginActionMenu(formBean ,
@@ -29,9 +37,6 @@
<strong>Recipients CC: </strong><%=recipientsCC%><br/>
<%
}
- %>
- <strong <%if ("".equals(alertText)) {
%>style="color:red;"<%}%>>Alert text for mandatory fields:
</strong><%=alertText%><br/>
- <%
jData.gui().html().drawEndActionMenu(formBean ,
null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
}
Index: simple_form_generator_process_post.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/simple_form_generator_process_post.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- simple_form_generator_process_post.inc 24 Jun 2005 14:13:17 -0000
1.1.2.1
+++ simple_form_generator_process_post.inc 24 Jun 2005 14:45:58 -0000
1.1.2.2
@@ -22,6 +22,7 @@
logger.debug("recipientsCC: " + recipientsCC);
logger.debug("subject: " + subject);
+ StringBuffer mailBody = new StringBuffer();
// get all values posted
JahiaContainerList fields = form.getContainerList( "fields" );
if (fields != null) {
@@ -42,12 +43,25 @@
}
}
logger.debug("-- " + fieldTitle + ": " +
postedValuesSB.toString());
+ mailBody.append(fieldTitle + " : " +
postedValuesSB.toString() + "\n");
if (isMandatory && "".equals(postedValuesSB.toString()))
{
logger.debug("Field [" + fieldTitle + "] is
mandatory");
emptyMandatoryFields.add(new
Integer(currentField.getID()));
}
}
}
+ if (emptyMandatoryFields.isEmpty()) {
+ //Send the mail
+ sender = JahiaTools.html2text(sender);
+ recipients = JahiaTools.html2text(recipients);
+ recipientsCC = JahiaTools.html2text(recipientsCC);
+ subject = JahiaTools.html2text(subject);
+ String body = JahiaTools.html2text(mailBody.toString());
+ ServicesRegistry.getInstance ().getMailService
().sendMessage (sender, recipients,
+ recipientsCC, null, subject, body);
+ logger.debug("Mail sent");
+
+ }
}
} catch (NumberFormatException nfe) {
logger.error("Could not get formId from post");
