X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2Ftarget%2FFileBasedMailbox.java;h=3f198d074429e27d5cacea58a7d1001f7068305d;hb=8a4fb7b7043f096c7901f147295e5a539fbd71a6;hp=e3b9afdc49e03041109b0661d44656ead5c0fe23;hpb=0f7ce01e0256db7bf28e104887f78159ca23aed2;p=org.ibex.mail.git

diff --git a/src/org/ibex/mail/target/FileBasedMailbox.java b/src/org/ibex/mail/target/FileBasedMailbox.java
index e3b9afd..3f198d0 100644
--- a/src/org/ibex/mail/target/FileBasedMailbox.java
+++ b/src/org/ibex/mail/target/FileBasedMailbox.java
@@ -21,17 +21,22 @@ public class FileBasedMailbox extends Mailbox.Default {
 
     public static final long MAGIC_DATE = 0;
     private static final char slash = File.separatorChar;
-    private static final WeakHashMap<String,FileBasedMailbox> instances = new WeakHashMap<String,FileBasedMailbox>();
+    private static final WeakHashMap<String,Mailbox> instances = new WeakHashMap<String,Mailbox>();
     public String toString() { return "[FileBasedMailbox " + path.getAbsolutePath() + "]"; }
     public Mailbox slash(String name, boolean create) { return getFileBasedMailbox(path.getAbsolutePath()+slash+name, create); }
 
     // FIXME: should be a File()
-    public static synchronized FileBasedMailbox getFileBasedMailbox(String path, boolean create) {
+    public static synchronized Mailbox getFileBasedMailbox(String path, boolean create) {
         try {
-            FileBasedMailbox ret = instances.get(path);
+            Mailbox ret = instances.get(path);
             if (ret == null) {
                 if (!create && !(new File(path).exists())) return null;
-                instances.put(path, ret = new FileBasedMailbox(new File(path)));
+                if (new File(new File(path)+"/subscribers").exists()) {
+                    ret = new MailingList(new File(path), new FileBasedMailbox(new File(path)));
+                } else {
+                    ret = new FileBasedMailbox(new File(path));
+                }
+                instances.put(path, ret);
             }
             return ret;
         } catch (Exception e) {
@@ -72,16 +77,36 @@ public class FileBasedMailbox extends Mailbox.Default {
                 if (files[i].indexOf('.') != -1) files[i] = files[i].substring(0, files[i].indexOf('.'));
                 int n = Integer.parseInt(files[i]);
                 if (n>=uidNext) uidNext = n;
-            } catch(Exception e) { /* DELIBERATE */ }
+            } catch(Exception e) { Log.error(this, e); }
         }
     }
 
+    public String[] sort(String[] s) {
+        Arrays.sort(s);
+        return s;
+    }
+
+    public String[] files() {
+        String[] s = path.list(filter);
+        Arrays.sort(s, comparator);
+        return s;
+    }
+    
+    private static Comparator<String> comparator = new Comparator<String>() {
+        public int compare(String a, String b) {
+            if (a.indexOf('.')==-1) return a.compareTo(b);
+            if (b.indexOf('.')==-1) return a.compareTo(a);
+            int ai = Integer.parseInt(a.substring(0, a.indexOf('.')));
+            int bi = Integer.parseInt(b.substring(0, b.indexOf('.')));
+            return ai<bi ? -1 : ai>bi ? 1 : 0;
+        }
+    };
 
     public Mailbox.Iterator  iterator()           { return new Iterator(); }
     public synchronized void add(Message message) { add(message, Mailbox.Flag.RECENT); }
     public String[] children() {
         Vec vec = new Vec();
-        String[] list = path.list();
+        String[] list = sort(path.list());
         for(int i=0; i<list.length; i++) {
             File f = new File(path.getAbsolutePath() + slash + list[i]);
             if (f.isDirectory() && f.getName().charAt(0) != '.') vec.addElement(list[i]);
@@ -113,11 +138,14 @@ public class FileBasedMailbox extends Mailbox.Default {
         Log.info(this, path + " <= " + message.summary());
     }
 
+    private static FilenameFilter filter =
+        new FilenameFilter() { public boolean accept(File dir, String name) {
+            return name.endsWith(".");
+        } };
+
     private class Iterator extends Mailbox.Default.Iterator {
         int cur = -1;
-        String[] files = path.list(new FilenameFilter() { public boolean accept(File dir, String name) {
-            return name.endsWith(".");
-        } });
+        String[] files = files();
         private File file() { return new File(path.getAbsolutePath() + slash + files[cur]); }
         public boolean done() { return cur >= files.length; }
         public boolean next() { cur++; return !done(); }
@@ -131,7 +159,7 @@ public class FileBasedMailbox extends Mailbox.Default {
             if (done()) return null;
             FileInputStream fis = null;
             try {
-                return new Headers(new Stream(new FileInputStream(file())));
+                return new Headers.Original(new Stream(new FileInputStream(file())));
             } catch (IOException e) { throw new MailException.IOException(e);
             } finally { if (fis != null) try { fis.close(); } catch (Exception e) { /* DELIBERATE */ } }
         }
@@ -146,14 +174,16 @@ public class FileBasedMailbox extends Mailbox.Default {
     }
 
     public static class Servlet extends HttpServlet {
-        public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {doGet(request, response);}
+        public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { doGet(request, response); }
         private void frames(HttpServletRequest request, HttpServletResponse response, boolean top) throws IOException {
-            String basename = request.getServletPath();
+            String basename = request.getRequestURI();
             PrintWriter pw = new PrintWriter(response.getWriter());
             pw.println("<html>");
             if (top) {
                 pw.println("  <frameset rows='30%,*'>");
-                pw.println("    <frame src='"+basename+"?frame=top' marginwidth=0 marginheight=0 name=top/>");
+                //pw.println("    <frame src='"+basename+"?frame=banner' marginwidth=0 marginheight=0 name=banner/>");
+                //pw.println("    <frame src='"+basename+"?frame=top' marginwidth=0 marginheight=0 name=top/>");
+                pw.println("    <frame src='"+basename+"?frame=topright' marginwidth=0 marginheight=0 name=topright/>");
                 pw.println("    <frame src='"+basename+"?frame=bottom' marginwidth=0 marginheight=0 name='bottom'/>");
             } else {
                 pw.println("  <frameset cols='150,*'>");
@@ -167,10 +197,11 @@ public class FileBasedMailbox extends Mailbox.Default {
 
         public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
             String frame = request.getParameter("frame");
-            String basename = request.getServletPath();
+            String basename = request.getRequestURI();
 
             if (frame == null) { frames(request, response, true); return; }
             if (frame.equals("top")) { frames(request, response, false); return; }
+            if (frame.equals("banner")) { banner(request, response); return; }
             if (frame.equals("topleft")) { return; }
 
             if (request.getServletPath().indexOf("..") != -1) throw new IOException(".. not allowed in image paths");
@@ -200,30 +231,83 @@ public class FileBasedMailbox extends Mailbox.Default {
             throws IOException {
             PrintWriter pw = new PrintWriter(response.getWriter());
             pw.println("<html>");
+            pw.println("  <head>");
+            pw.println("  <style>");
+            pw.println("      body { margin: 10px; }");
+            pw.println("      pre {");
+            pw.println("         font-family: monospace;");
+            pw.println("         background-color:  #F0F0E0;");
+            pw.println("         color: rgb(0, 0, 0);");
+            pw.println("         padding: 5px;");
+            pw.println("         margin: 0px;");
+            pw.println("         overflow: auto;");
+            //pw.println("         width: 80%;");
+            //pw.println("         border-style: solid;");
+            //pw.println("         border-width: 1px;");
+            pw.println("      }");
+            pw.println("  </style>");
+            pw.println("  </head>");
             pw.println("  <body>");
-            pw.println("    <pre>");
             if (request.getParameter("msgnum") != null) {
                 int target = Integer.parseInt(request.getParameter("msgnum"));
-                for(Mailbox.Iterator it = mbox.iterator(); it.next();) {
-                    if (it.num() == target) {
-                        StringBuffer tgt = new StringBuffer();
-                        it.cur().getBody().getStream().transcribe(tgt);
-                        pw.println(tgt.toString());
+                Mailbox.Iterator it = mbox.iterator();
+                while(it.next())
+                    if (it.num() == target)
                         break;
+                if (it.cur() != null) {
+                    pw.println("    <table width=100% border=0 cellspacing=0 style='border: 1px black solid; background-color:#F0F0E0;'>");
+                    pw.println("      <tr style='border: 1px black solid; font-family: monospace'><td style='padding: 5px'>");
+                    Headers h = it.cur().headers;
+                    pw.println(" Subject: " + it.cur().subject +"<br>");
+                    pw.println("    From: " + it.cur().from +"<br>");
+                    pw.println("    Date: " + it.cur().date +"<br>");
+                        /*
+                    for(java.util.Enumeration e = h.names(); e.hasMoreElements();) {
+                        String key = (String)e.nextElement();
+                        if (key==null || key.length()==0 || key.equals("from") ||
+                            key.equals("to") || key.equals("subject") || key.equals("date")) continue;
+                        key = Character.toUpperCase(key.charAt(0)) + key.substring(1);
+                        String val = h.get(key);
+                        for(int i=key.length(); i<15; i++)pw.print(" ");
+                        pw.print(key+": ");
+                        pw.println(val);
                     }
+                        */
+                    pw.print("</td></tr><tr><td style='border-top: 1px black; border-top-style: dotted;'><pre>");
+                    StringBuffer tgt = new StringBuffer();
+                    it.cur().getBody().getStream().transcribe(tgt);
+                    pw.println(tgt.toString());
+                    pw.println("    </pre></td></tr></table>");
                 }
             }
-            pw.println("    </pre>");
             pw.println("  </body>");
             pw.println("</html>");
+            pw.flush();
+            pw.close();
         }
         
+        private void banner(HttpServletRequest request, HttpServletResponse response) throws IOException {
+            String basename = request.getServletPath();
+            String realpath = getServletContext().getRealPath(basename);
+            /*
+            MailingList list = MailingList.getMailingList(realpath);
+            list.banner(request, response);
+            */
+            banner(request, response);
+        }
+
         private void topright(HttpServletRequest request, HttpServletResponse response, String[][] messages) throws IOException {
             PrintWriter pw = new PrintWriter(response.getWriter());
-            String basename = request.getServletPath();
+            String basename = request.getRequestURI();
             pw.println("<html>");
             pw.println("  <head>");
             pw.println("    <style>");
+            pw.println("      TH, TD, P, LI {");
+            pw.println("          font-family: helvetica, verdana, arial, sans-serif;");
+            pw.println("          font-size: 12px;  ");
+            pw.println("          text-decoration:none; ");
+            pw.println("      }");
+            pw.println("      body { margin: 10px; }");
             pw.println("      a:link    { color: #000; text-decoration: none; }");
             pw.println("      a:active  { color: #f00; text-decoration: none; }");
             pw.println("      a:visited { color: #777; text-decoration: none; }");
@@ -244,31 +328,39 @@ public class FileBasedMailbox extends Mailbox.Default {
             pw.println("      }");
             pw.println("      function choose(who) {");
             pw.println("          who.style.background = '#ffc';");
-            pw.println("          if (chosen != null) chosen.style.background = '#aaa';");
-            pw.println("          top.bottom.location='"+basename+"?frame=bottom&msgnum='+who.id;");
+            pw.println("          if (chosen != null) chosen.style.background = '#ccc';");
+            pw.println("          parent.parent.bottom.location='"+basename+"?frame=bottom&msgnum='+who.id;");
             pw.println("          chosen = who;");
             pw.println("      }");
             pw.println("    </script>");
-            pw.println("    <table width=100% border=0 cellpadding=0 cellspacing=0>");
-            boolean odd=false;
+            pw.println("    <div style='border: 1px black solid;'><table width=100% border=0 cellpadding=0 cellspacing=0>");
+            pw.println("    <tr><td style='padding: 4px' bgcolor=#eff7ff>");
+            pw.flush();
+            banner(request, response);
+            pw.println("    </td></tr>");
+            pw.println("    <tr><td>");
+            pw.println("    <table width=100% cellpadding=0 cellspacing=0 style='border-top: 1px black solid; cursor:pointer;'>");
+            boolean odd=true;
             for(int i=0; i<messages.length; i++) {
                 odd = !odd;
-                pw.println("      <tr style='background: "+(odd?"#e8eef7":"white")+"' id='"+i+"' "+
+                String[] m = messages[i];
+                pw.println("      <tr style='cursor:pointer; background: "+(odd?"#e8eef7":"white")+"' id='"+m[3]+"' "+
                            "onmouseover='this.style.color=\"blue\"' "+
                            "onmouseout='this.style.color=\"black\"' "+
                            "onclick='choose(this);'>");
-                String[] m = messages[i];
-                pw.println("<td style='padding:5px; padding-bottom:2px'>"+m[0]+"</td>");
-                pw.println("<td style='padding:5px; padding-bottom:2px'>"+m[1]+"</td>");
-                pw.println("<td style='padding:5px; padding-bottom:2px'>"+m[2]+"</td>");
+                pw.println("<td style='cursor:pointer; padding:5px; padding-bottom:2px'>"+m[0]+"</td>");
+                pw.println("<td style='cursor:pointer; padding:5px; padding-bottom:2px'>"+m[1]+"</td>");
+                pw.println("<td style='cursor:pointer; padding:5px; padding-bottom:2px'>"+m[2]+"</td>");
                 pw.println("</tr>");
                 pw.println("<script> all["+i+"] = document.getElementById('"+i+"'); </script>");
-                pw.println("<tr height=1 bgcolor=black><td colspan=3>");
-                pw.println("    <img src=http://www.xwt.org/images/clearpixel.gif></td></tr>");
             }
             pw.println("    </table>");
+            pw.println("    </td></tr>");
+            pw.println("    </table></div>");
             pw.println("  </body>");
             pw.println("</html>");
+            pw.flush();
+            pw.close();
         }
     }
 }