highly suspicious changes to IMAP.java

[org.ibex.mail.git] / src / org / ibex / mail / Whitelist.java

diff --git a/src/org/ibex/mail/Whitelist.java b/src/org/ibex/mail/Whitelist.java
index 1d76bfc..f85181d 100644 (file)
--- a/src/org/ibex/mail/Whitelist.java
+++ b/src/org/ibex/mail/Whitelist.java
@@ -12,17 +12,13 @@ import java.util.*;
 import java.sql.Timestamp;
 import java.sql.Connection;
 
-public class Whitelist extends SqliteTable {
-
-    public Whitelist(String filename) {
-        super(filename,
-              new String[] {
-                  "create table if not exists 'whitelist' (email)",
-                  "create table if not exists 'pending' (spamid,email,message,date)"
-              },
-              true,
-              "pending",
-              "date");
+public class Whitelist extends SqliteDB {
+
+    public Whitelist(String filename) throws SQLException {
+        super(filename);
+        SqliteTable whitelist = getTable("whitelist", "(email)");
+        SqliteTable pending   = getTable("pending",   "(spamid,email,message,date)");
+        pending.reap("date");
     }
 
     public boolean handleRequest(org.ibex.net.Connection c) {
@@ -100,6 +96,9 @@ public class Whitelist extends SqliteTable {
                     a = m.envelopeFrom;
                     if (a!=null) addWhitelist(a);
                     hsm.add(m);
+                    if (m.cc != null) for(Address aa : m.cc) {
+                        if (aa!= null) addWhitelist(aa);
+                    }
                 } while (rs.next());
             }
             for(Message m : hsm)