Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-mailfriend/src/java/com/finalist/portlets/mailfriend
In directory
james.mmbase.org:/tmp/cvs-serv15916/portlets-mailfriend/src/java/com/finalist/portlets/mailfriend
Modified Files:
Tag: b1_4
MailFriendPortlet.java
Log Message:
CMSC-1123 Mailform backfix from L1
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-mailfriend/src/java/com/finalist/portlets/mailfriend
See also: http://www.mmbase.org/jira/browse/CMSC-1123
Index: MailFriendPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-mailfriend/src/java/com/finalist/portlets/mailfriend/MailFriendPortlet.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- MailFriendPortlet.java 26 Nov 2007 11:42:55 -0000 1.2
+++ MailFriendPortlet.java 28 Oct 2008 13:48:12 -0000 1.2.2.1
@@ -6,7 +6,7 @@
The license (Mozilla version 1.0) can be read at the MMBase site.
See http://www.MMBase.org/license
- */
+*/
package com.finalist.portlets.mailfriend;
import java.io.IOException;
@@ -15,6 +15,7 @@
import java.util.Iterator;
import java.util.Map;
import javax.portlet.*;
+
import net.sf.mmapps.commons.util.StringUtil;
import net.sf.mmapps.modules.cloudprovider.CloudProvider;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -31,14 +32,12 @@
protected static final String ACTION_PARAM = "action";
protected static final String CONTENTELEMENT = "contentelement";
-
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
String action = request.getParameter(ACTION_PARAM);
Map<String, String> errorMessages = new Hashtable<String, String>();
if (action == null) {
response.setPortletMode(CmscPortletMode.EDIT_DEFAULTS);
- }
- else if (action.equals("edit")) {
+ } else if (action.equals("edit")) {
PortletPreferences preferences = request.getPreferences();
String contentelement = preferences.getValue(CONTENTELEMENT, null);
@@ -47,7 +46,9 @@
String fromemail = request.getParameter("fromemail");
String toemail = request.getParameter("toemail");
String toname = request.getParameter("toname");
+ String message = request.getParameter("message");
String articleNumber = request.getParameter("articleNumber");
+ String articleUrlPath = request.getParameter("articleUrlPath");
if (StringUtil.isEmptyOrWhitespace(articleNumber)) {
errorMessages.put("article", "view.error.noarticle");
}
@@ -57,8 +58,7 @@
}
if (StringUtil.isEmptyOrWhitespace(fromemail)) {
errorMessages.put("fromemail", "view.fromemail.empty");
- }
- else if (!fromemail.matches(emailRegex)) {
+ } else if (!fromemail.matches(emailRegex)) {
errorMessages.put("fromemail", "view.fromemail.invalid");
}
if (StringUtil.isEmptyOrWhitespace(toname)) {
@@ -66,8 +66,7 @@
}
if (StringUtil.isEmptyOrWhitespace(toemail)) {
errorMessages.put("toemail", "view.toemail.empty");
- }
- else if (!toemail.matches(emailRegex)) {
+ } else if (!toemail.matches(emailRegex)) {
errorMessages.put("toemail", "view.toemail.invalid");
}
@@ -75,7 +74,7 @@
CloudProvider cloudProvider =
CloudProviderFactory.getCloudProvider();
Cloud cloud = cloudProvider.getCloud();
Node mailfriend = cloud.getNode(contentelement);
- boolean sent = sendEmail(cloud, toname, toemail, fromname,
fromemail, mailfriend, request, articleNumber);
+ boolean sent = sendEmail(cloud, toname, toemail, fromname,
fromemail, mailfriend, request, articleNumber, message);
if (!sent) {
errorMessages.put("sendemail", "view.error.sendemail");
}
@@ -87,27 +86,24 @@
parameterMap.put("toemail", toemail);
parameterMap.put("toname", toname);
parameterMap.put("articleNumber", articleNumber);
+ parameterMap.put("message", message);
+ parameterMap.put("articleUrlPath", articleUrlPath);
request.getPortletSession().setAttribute("errormessages",
errorMessages);
request.getPortletSession().setAttribute("parameterMap",
parameterMap);
- }
- else {
+ } else {
request.getPortletSession().setAttribute("confirm", "confirm");
}
- }
- else {
+ } else {
getLogger().error("No contentelement");
}
// switch to View mode
response.setPortletMode(PortletMode.VIEW);
- }
- else {
+ } else {
getLogger().error("Unknown action: '" + action + "'");
}
}
-
- private boolean sendEmail(Cloud cloud, String toname, String toemail,
String fromname, String fromemail,
- Node mailfriend, ActionRequest request, String articleNumber) {
+ private boolean sendEmail(Cloud cloud, String toname, String toemail,
String fromname, String fromemail, Node mailfriend, ActionRequest request,
String articleNumber, String tomessage) {
boolean sent = false;
StringBuffer link = new StringBuffer();
link.append(request.getScheme());
@@ -123,6 +119,7 @@
String subject = mailfriend.getStringValue("subject");
message = message.replace("#VRIEND#", toname);
message = message.replace("#URL#", link.toString());
+ message = message.replace("#BERICHT#", tomessage);
message = message.replace("#AFZENDER#", fromname);
subject = subject.replace("#AFZENDER#", fromname);
try {
@@ -135,7 +132,6 @@
return sent;
}
-
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
PortletPreferences preferences = request.getPreferences();
@@ -163,22 +159,19 @@
request.setAttribute(keyValue, entryValue);
}
}
- }
- else {
+ } else {
getLogger().error("No contentelement");
}
super.doView(request, response);
}
-
public void processEdit(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
super.processEdit(request, response);
String action = request.getParameter(ACTION_PARAM);
if (action == null) {
response.setPortletMode(PortletMode.EDIT);
- }
- else if (action.equals("delete")) {
+ } else if (action.equals("delete")) {
String deleteNumber = request.getParameter("deleteNumber");
CloudProvider cloudProvider = CloudProviderFactory.getCloudProvider();
Cloud cloud = cloudProvider.getCloud();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
