Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory
james.mmbase.org:/tmp/cvs-serv6541/portlets-newsletter/src/java/com/finalist/newsletter/publisher
Modified Files:
NewsletterPublisher.java
Log Message:
CMSC-707
CMSC-733
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
See also: http://www.mmbase.org/jira/browse/CMSC-707
See also: http://www.mmbase.org/jira/browse/CMSC-733
Index: NewsletterPublisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublisher.java 21 Jan 2008 22:09:00 -0000 1.4
+++ NewsletterPublisher.java 19 Feb 2008 21:13:55 -0000 1.5
@@ -14,6 +14,7 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
+import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -88,14 +89,15 @@
String nameFrom = null;
String emailReplyTo = null;
String nameReplyTo = null;
- /*
- * Node newsletterNode = SearchUtil.findRelatedNode(publicationNode,
- * "newsletter", "related"); if (newsletterNode != null) { emailFrom =
- * newsletterNode.getStringValue("emailfrom"); nameFrom =
- * newsletterNode.getStringValue("namefrom"); emailReplyTo =
- * newsletterNode.getStringValue("emailreplyto"); nameReplyTo =
- * newsletterNode.getStringValue("namereplyto"); }
- */
+
+ Node newsletterNode = SearchUtil.findRelatedNode(publicationNode,
"newsletter", "related");
+ if (newsletterNode != null) {
+ emailFrom = newsletterNode.getStringValue("from_mail");
+ nameFrom = newsletterNode.getStringValue("from_name");
+ emailReplyTo = newsletterNode.getStringValue("replyto_mail");
+ nameReplyTo = newsletterNode.getStringValue("replyto_name");
+ }
+
if (emailFrom == null || emailFrom.length() == 0) {
emailFrom = PropertiesUtil.getProperty("newsletter.from.mail");
if (emailFrom == null || emailFrom.length() == 0) {
@@ -130,7 +132,7 @@
if (nameReplyTo != null && nameReplyTo.length() > 0) {
replyToAddress.setPersonal(nameReplyTo);
}
- InternetAddress[] addresses= new InternetAddress[1];
+ InternetAddress[] addresses = new InternetAddress[1];
addresses[0] = replyToAddress;
message.setReplyTo(addresses);
} else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
