Author: snoopdave
Date: Sat Apr 6 13:02:44 2013
New Revision: 1465236
URL: http://svn.apache.org/r1465236
Log:
Fix for https://issues.apache.org/jira/browse/ROL-1926
Comment notifcation emails being sent before comment approval
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/MailUtil.java?rev=1465236&r1=1465235&r2=1465236&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
Sat Apr 6 13:02:44 2013
@@ -294,31 +294,35 @@ public class MailUtil {
// build list of email addresses to send notification to
Set subscribers = new TreeSet();
- // If we are to notify subscribers, then...
- if (notifySubscribers) {
- log.debug("Sending notification email to all subscribers");
-
- // Get all the subscribers to this comment thread
- List comments = entry.getComments(true, true);
- for (Iterator it = comments.iterator(); it.hasNext();) {
- WeblogEntryComment comment = (WeblogEntryComment) it.next();
- if (!StringUtils.isEmpty(comment.getEmail())) {
- // If user has commented twice,
- // count the most recent notify setting
- if (comment.getNotify().booleanValue()) {
- // only add those with valid email
- if (comment.getEmail().matches(EMAIL_ADDR_REGEXP)) {
- subscribers.add(comment.getEmail());
- }
- } else {
- // remove user who doesn't want to be notified
- subscribers.remove(comment.getEmail());
- }
- }
- }
- } else {
- log.debug("Sending notification email only to weblog owner");
- }
+ // If we are to notify subscribers, then...
+ if (notifySubscribers) {
+ log.debug("Sending notification email to all
subscribers");
+
+ // Get all the subscribers to this comment thread
+ List comments = entry.getComments(true, true);
+ for (Iterator it = comments.iterator(); it.hasNext();) {
+ WeblogEntryComment comment =
(WeblogEntryComment) it.next();
+ if (!StringUtils.isEmpty(comment.getEmail())) {
+ // If user has commented twice,
+ // count the most recent notify setting
+ if (commentObject.getApproved()) {
+ if
(comment.getNotify().booleanValue()) {
+ // only add those with
valid email
+ if
(comment.getEmail().matches(EMAIL_ADDR_REGEXP)) {
+ log.info("Add to
subscribers list : " + comment.getEmail());
+
subscribers.add(comment.getEmail());
+ }
+ } else {
+ // remove user who
doesn't want to be notified
+ log.info("Remove from
subscribers list : " + comment.getEmail());
+
subscribers.remove(comment.getEmail());
+ }
+ }
+ }
+ }
+ } else {
+ log.debug("Sending notification email only to weblog
owner");
+ }
// Form array of commenter addrs
String[] commenterAddrs = (String[])subscribers.toArray(new
String[0]);
@@ -357,7 +361,8 @@ public class MailUtil {
msg.append((escapeHtml) ? "\n" : "<br />");
// Build link back to comment
- String commentURL =
WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogCommentsURL(weblog,
null, entry.getAnchor(), true);
+ String commentURL = WebloggerFactory.getWeblogger()
+ .getUrlStrategy().getWeblogCommentsURL(weblog, null,
entry.getAnchor(), true);
if (escapeHtml) {
msg.append(commentURL);
@@ -377,7 +382,8 @@ public class MailUtil {
for (Iterator it = messages.getMessages(); it.hasNext();) {
RollerMessage rollerMessage = (RollerMessage)it.next();
ownermsg.append((escapeHtml) ? "" : "<li>");
-
ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()),
(Object[])rollerMessage.getArgs()) );
+ ownermsg.append(MessageFormat.format(resources.getString(
+ rollerMessage.getKey()),
(Object[])rollerMessage.getArgs()) );
ownermsg.append((escapeHtml) ? "\n\n" : "</li>");
}
if (messages.getMessageCount() > 0) {
@@ -394,7 +400,8 @@ public class MailUtil {
for (Iterator it = messages.getErrors(); it.hasNext();) {
RollerMessage rollerMessage = (RollerMessage)it.next();
ownermsg.append((escapeHtml) ? "" : "<li>");
-
ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()),
(Object[])rollerMessage.getArgs()) );
+ ownermsg.append(MessageFormat.format(resources.getString(
+ rollerMessage.getKey()),
(Object[])rollerMessage.getArgs()) );
ownermsg.append((escapeHtml) ? "\n\n" : "</li>");
}
if (messages.getErrorCount() > 0) {
@@ -542,7 +549,8 @@ public class MailUtil {
StringBuffer msg = new StringBuffer();
msg.append(resources.getString("email.comment.commentApproved"));
msg.append("\n\n");
-
msg.append(WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogCommentsURL(weblog,
null, entry.getAnchor(), true));
+ msg.append(WebloggerFactory.getWeblogger().getUrlStrategy()
+ .getWeblogCommentsURL(weblog, null, entry.getAnchor(),
true));
// send message to author of approved comment
try {
@@ -663,7 +671,8 @@ public class MailUtil {
// Extract the remaining potentially good addresses
remainingAddresses=ex.getValidUnsentAddresses();
}
- } while (remainingAddresses!=null && remainingAddresses.length>0
&& remainingAddresses.length!=nAddresses);
+ } while (remainingAddresses!=null && remainingAddresses.length>0
+ &&
remainingAddresses.length!=nAddresses);
} finally {
transport.close();
