Commit d6083331 authored by conor's avatar conor

added date to email and user to subject as per feature request from jamest

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3269 b35dd754-fafc-0310-a699-88a17e54d16e
parent ef3be5bb
...@@ -13,6 +13,7 @@ package org.jivesoftware.wildfire.plugin; ...@@ -13,6 +13,7 @@ package org.jivesoftware.wildfire.plugin;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.mail.internet.InternetAddress; import javax.mail.internet.InternetAddress;
...@@ -459,6 +460,10 @@ public class ContentFilterPlugin implements Plugin, PacketInterceptor { ...@@ -459,6 +460,10 @@ public class ContentFilterPlugin implements Plugin, PacketInterceptor {
this.violationIncludeOriginalPacketEnabled); this.violationIncludeOriginalPacketEnabled);
} }
//TODO consider spining off a separate thread here,
//in high volume situations, it will result in
//in faster response and notification is not required
//to be real time.
sendViolationNotification(original); sendViolationNotification(original);
} }
...@@ -499,7 +504,7 @@ public class ContentFilterPlugin implements Plugin, PacketInterceptor { ...@@ -499,7 +504,7 @@ public class ContentFilterPlugin implements Plugin, PacketInterceptor {
private void sendViolationNotification(Packet originalPacket) { private void sendViolationNotification(Packet originalPacket) {
String subject = "Content filter notification!"; String subject = "Content filter notification! (" + originalPacket.getFrom().getNode() + ")";
String body = null; String body = null;
if (originalPacket instanceof Message) { if (originalPacket instanceof Message) {
...@@ -575,6 +580,8 @@ public class ContentFilterPlugin implements Plugin, PacketInterceptor { ...@@ -575,6 +580,8 @@ public class ContentFilterPlugin implements Plugin, PacketInterceptor {
message.setText(body); message.setText(body);
message.setSubject(subject); message.setSubject(subject);
message.setSentDate(new Date());
messages.add(message); messages.add(message);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment