You can subscribe to this list here.
2004 |
Jan
|
Feb
(5) |
Mar
(8) |
Apr
(32) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(1) |
Sep
(22) |
Oct
(21) |
Nov
(6) |
Dec
(19) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
(2) |
Feb
|
Mar
(14) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(12) |
Sep
(29) |
Oct
(30) |
Nov
(19) |
Dec
(6) |
2006 |
Jan
(29) |
Feb
(11) |
Mar
(2) |
Apr
(6) |
May
(2) |
Jun
(6) |
Jul
|
Aug
|
Sep
(3) |
Oct
(9) |
Nov
(2) |
Dec
|
2007 |
Jan
(1) |
Feb
(6) |
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
(3) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
(2) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
From: Sandy M. <san...@us...> - 2004-06-28 21:05:51
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/prefs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2591/src/java/edu/ufl/osg/webmail/prefs Modified Files: package.html Log Message: Correct all instances of "threashold" to "threshold". Index: package.html =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/prefs/package.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** package.html 20 Apr 2004 19:08:10 -0000 1.6 --- package.html 28 Jun 2004 20:50:51 -0000 1.7 *************** *** 45,52 **** <dd>The default message sort for the folder view.</dd> ! <dt>message.junk.threashold</dt> <dd> ! Any messages with a junk score greater or equal to this threashold will ! be flagged at junk. A value of zero means the junk threashold is disabled. Default is 8. This must be parseable by {@link java.lang.Integer#parseInt(String)}. --- 45,52 ---- <dd>The default message sort for the folder view.</dd> ! <dt>message.junk.threshold</dt> <dd> ! Any messages with a junk score greater or equal to this threshold will ! be flagged at junk. A value of zero means the junk threshold is disabled. Default is 8. This must be parseable by {@link java.lang.Integer#parseInt(String)}. |
From: Sandy M. <san...@us...> - 2004-06-28 21:05:51
|
Update of /cvsroot/gatormail/GatorMail/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2591/src Modified Files: Messages.properties Log Message: Correct all instances of "threashold" to "threshold". Index: Messages.properties =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/Messages.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Messages.properties 24 May 2004 19:27:31 -0000 1.7 --- Messages.properties 28 Jun 2004 20:50:51 -0000 1.8 *************** *** 296,315 **** message.attachment.message=Attached Message message.attachment.save=Download Message ! message.junk.threashold.0=Disabled, no messages flagged ! message.junk.threashold.1=1 Aggressive, a lot of legit email will be flagged ! message.junk.threashold.2=2 ! message.junk.threashold.3=3 Somewhat aggressive ! message.junk.threashold.4=4 ! message.junk.threashold.5=5 Average ! message.junk.threashold.6=6 ! message.junk.threashold.7=7 ! message.junk.threashold.8=8 Conservative, a few legit emails may be flagged ! message.junk.threashold.9=9 ! message.junk.threashold.10=10 Very conservative, most spam won't be flagged ! message.junk.threashold.11=11 ! message.junk.threashold.12=12 ! message.junk.threashold.13=13 ! message.junk.threashold.14=14 ! message.junk.threashold.15=15 Only the most flagrant spam will be flagged messageList.unread=(Un)Read moveToFolder.result.multiple.success={0} Messages moved to {1}. --- 296,315 ---- message.attachment.message=Attached Message message.attachment.save=Download Message ! message.junk.threshold.0=Disabled, no messages flagged ! message.junk.threshold.1=1 Aggressive, a lot of legit email will be flagged ! message.junk.threshold.2=2 ! message.junk.threshold.3=3 Somewhat aggressive ! message.junk.threshold.4=4 ! message.junk.threshold.5=5 Average ! message.junk.threshold.6=6 ! message.junk.threshold.7=7 ! message.junk.threshold.8=8 Conservative, a few legit emails may be flagged ! message.junk.threshold.9=9 ! message.junk.threshold.10=10 Very conservative, most spam won't be flagged ! message.junk.threshold.11=11 ! message.junk.threshold.12=12 ! message.junk.threshold.13=13 ! message.junk.threshold.14=14 ! message.junk.threshold.15=15 Only the most flagrant spam will be flagged messageList.unread=(Un)Read moveToFolder.result.multiple.success={0} Messages moved to {1}. *************** *** 325,329 **** preferences.maxInactiveMultiplier.default=default preferences.maxInactiveMultiplier.long=long ! preferences.junkThreahsold.invalid=The Junk Threashold must be a whole number between 0 and 15 inclusive. prompt.username=Username prompt.password=Password --- 325,329 ---- preferences.maxInactiveMultiplier.default=default preferences.maxInactiveMultiplier.long=long ! preferences.junkThreahsold.invalid=The Junk Threshold must be a whole number between 0 and 15 inclusive. prompt.username=Username prompt.password=Password |
From: Sandy M. <san...@us...> - 2004-06-11 12:56:55
|
Update of /cvsroot/gatormail/GatorMail/src/webapp/tiles/login In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14189/src/webapp/tiles/login Modified Files: loginFooter.jsp Log Message: Removed link to old webmail Index: loginFooter.jsp =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/login/loginFooter.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** loginFooter.jsp 13 Feb 2004 19:43:38 -0000 1.2 --- loginFooter.jsp 11 Jun 2004 12:56:46 -0000 1.3 *************** *** 4,10 **** To submit a bug report or request a feature, click <html:link href="http://gatormail.sf.net/bugs">here</html:link>. - <br/> - To use the old webmail, click - <html:link href="https://old.webmail.ufl.edu/">here</html:link>. </p> <hr align="center" width="300" size="1" noshade> --- 4,7 ---- |
From: Sandy M. <san...@us...> - 2004-06-08 15:59:22
|
Update of /cvsroot/gatormail/GatorMail/src/webapp/tiles/message/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30982/src/webapp/tiles/message/text Modified Files: html.jsp Log Message: Catch more JavaScript on* events. Index: html.jsp =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/message/text/html.jsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** html.jsp 9 Feb 2004 23:08:49 -0000 1.1.1.1 --- html.jsp 8 Jun 2004 15:59:09 -0000 1.2 *************** *** 81,96 **** List filters = new ArrayList(); ! filters.add("onload"); ! filters.add("onupload"); filters.add("onclick"); filters.add("ondblclick"); filters.add("onmousedown"); - filters.add("onmouseup"); - filters.add("onmouseover"); filters.add("onmousemove"); filters.add("onmouseout"); ! filters.add("onkeypress"); ! filters.add("onkeydown"); ! filters.add("onkeyup"); Iterator iter = filters.iterator(); while (iter.hasNext()) { --- 81,108 ---- List filters = new ArrayList(); ! filters.add("onabort"); ! filters.add("onblur"); ! filters.add("onchange"); filters.add("onclick"); filters.add("ondblclick"); + filters.add("ondragdrop"); + filters.add("onerror"); + filters.add("onfocus"); + filters.add("onkeydown"); + filters.add("onkeypress"); + filters.add("onkeyup"); + filters.add("onload"); filters.add("onmousedown"); filters.add("onmousemove"); filters.add("onmouseout"); ! filters.add("onmouseover"); ! filters.add("onmouseup"); ! filters.add("onmove"); ! filters.add("onreset"); ! filters.add("onresize"); ! filters.add("onselect"); ! filters.add("onsubmit"); ! filters.add("onunload"); ! filters.add("onupload"); Iterator iter = filters.iterator(); while (iter.hasNext()) { |
From: Sandy M. <san...@us...> - 2004-05-28 14:18:03
|
Update of /cvsroot/gatormail/GatorMail/src/webapp/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv397/src/webapp/WEB-INF Modified Files: web.xml Log Message: Servlet 2.4 moved the location of taglibs, I think, this fixes them such that the web.xml is well formed. Index: web.xml =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/WEB-INF/web.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** web.xml 19 Mar 2004 20:15:45 -0000 1.4 --- web.xml 28 May 2004 14:17:50 -0000 1.5 *************** *** 74,133 **** </welcome-file-list> ! <!-- JSTL Tag Library Descriptors --> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri> ! <taglib-location>/WEB-INF/c.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri> ! <taglib-location>/WEB-INF/fmt.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/fn</taglib-uri> ! <taglib-location>/WEB-INF/fn.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/sql</taglib-uri> ! <taglib-location>/WEB-INF/sql.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/x</taglib-uri> ! <taglib-location>/WEB-INF/x.tld</taglib-location> ! </taglib> ! <!-- Struts Tag Library Descriptors --> ! <taglib> ! <taglib-uri>/tags/struts-bean</taglib-uri> ! <taglib-location>/WEB-INF/struts-bean.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>/tags/struts-html</taglib-uri> ! <taglib-location>/WEB-INF/struts-html.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>/tags/struts-logic</taglib-uri> ! <taglib-location>/WEB-INF/struts-logic.tld</taglib-location> ! </taglib> ! <!-- ! <taglib> ! <taglib-uri>/tags/struts-nested</taglib-uri> ! <taglib-location>/WEB-INF/struts-nested.tld</taglib-location> ! </taglib> ! --> ! <taglib> ! <taglib-uri>/tags/struts-tiles</taglib-uri> ! <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>/tags/webmail</taglib-uri> ! <taglib-location>/WEB-INF/GatorMail.tld</taglib-location> ! </taglib> <!-- Reference the JNDI DataSource from the Container --> --- 74,135 ---- </welcome-file-list> ! <jsp-config> ! <!-- JSTL Tag Library Descriptors --> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri> ! <taglib-location>/WEB-INF/c.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri> ! <taglib-location>/WEB-INF/fmt.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/fn</taglib-uri> ! <taglib-location>/WEB-INF/fn.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/sql</taglib-uri> ! <taglib-location>/WEB-INF/sql.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>http://java.sun.com/jsp/jstl/x</taglib-uri> ! <taglib-location>/WEB-INF/x.tld</taglib-location> ! </taglib> ! <!-- Struts Tag Library Descriptors --> ! <taglib> ! <taglib-uri>/tags/struts-bean</taglib-uri> ! <taglib-location>/WEB-INF/struts-bean.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>/tags/struts-html</taglib-uri> ! <taglib-location>/WEB-INF/struts-html.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>/tags/struts-logic</taglib-uri> ! <taglib-location>/WEB-INF/struts-logic.tld</taglib-location> ! </taglib> ! <!-- ! <taglib> ! <taglib-uri>/tags/struts-nested</taglib-uri> ! <taglib-location>/WEB-INF/struts-nested.tld</taglib-location> ! </taglib> ! --> ! <taglib> ! <taglib-uri>/tags/struts-tiles</taglib-uri> ! <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location> ! </taglib> ! <taglib> ! <taglib-uri>/tags/webmail</taglib-uri> ! <taglib-location>/WEB-INF/GatorMail.tld</taglib-location> ! </taglib> ! </jsp-config> <!-- Reference the JNDI DataSource from the Container --> |
From: Sandy M. <san...@us...> - 2004-05-24 19:27:42
|
Update of /cvsroot/gatormail/GatorMail/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31161/src Modified Files: Messages.properties Log Message: Removed duplicate property Index: Messages.properties =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/Messages.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Messages.properties 21 Apr 2004 18:12:32 -0000 1.6 --- Messages.properties 24 May 2004 19:27:31 -0000 1.7 *************** *** 132,136 **** #{0} will be replaced with the exception message error.login.mailhost.fetch.inbox=Error retrieving your INBOX. There is a problem with the mail server backend. Please try again after short while. ({0}) - error.login.mailhost.unknownhostexception=Unable to connect to mail server ({0}). Please inform the system adminstrator. # catch-all error error.default=An error has occured. --- 132,135 ---- |
From: Sandy M. <san...@us...> - 2004-05-20 17:44:40
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29658/src/java/edu/ufl/osg/webmail/actions Modified Files: AttachmentAction.java Log Message: Fixed bug #957542: images nested in attached message fail to load in html parts Index: AttachmentAction.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/actions/AttachmentAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AttachmentAction.java 22 Feb 2004 07:59:55 -0000 1.2 --- AttachmentAction.java 20 May 2004 17:44:31 -0000 1.3 *************** *** 75,79 **** * @throws MessagingException * @throws InvocationTargetException ! * @throws NoSuchMethodException * @throws IllegalAccessException * @throws InvalidSessionException --- 75,79 ---- * @throws MessagingException * @throws InvocationTargetException ! * @throws NoSuchMethodException * @throws IllegalAccessException * @throws InvalidSessionException *************** *** 204,207 **** --- 204,214 ---- } + /** + * Reentrant form of {@link #fetchBodyPart(edu.ufl.osg.webmail.forms.AttachmentForm, javax.mail.Message, javax.servlet.http.HttpServletRequest)}. + */ + private BodyPart fetchBodyPartFromCid(final String cid, final Message message) throws IOException, MessagingException { + return getContent(cid, (Multipart)message.getContent()); + } + private BodyPart getContent(final String cid, final Multipart part) throws MessagingException, IOException { BodyPart bodyPart = null; *************** *** 217,220 **** --- 224,230 ---- if (o instanceof Multipart) { bodyPart = getContent(cid, (Multipart)o); + } else if (o instanceof Message) { + final Message nestedMessage = (Message)o; + bodyPart = fetchBodyPartFromCid(cid, nestedMessage); } } |
From: Sandy M. <san...@us...> - 2004-05-17 18:41:28
|
Update of /cvsroot/gatormail/GatorMail/src/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30934/src/images Added Files: webMail-logo.psd Log Message: Added original source PSD for the UF webmail logo. --- NEW FILE: webMail-logo.psd --- (This appears to be a binary file; contents omitted.) |
From: Sandy M. <san...@us...> - 2004-05-03 21:13:11
|
Update of /cvsroot/gatormail/GatorMail In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1926 Modified Files: HISTORY.txt Log Message: Updated history before tagging release. Index: HISTORY.txt =================================================================== RCS file: /cvsroot/gatormail/GatorMail/HISTORY.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HISTORY.txt 24 Feb 2004 21:44:38 -0000 1.2 --- HISTORY.txt 3 May 2004 21:13:03 -0000 1.3 *************** *** 25,26 **** --- 25,30 ---- 2004-02-24: tagged release rel-1_0_10 + + 2004-05-03: + tagged release rel-1_0_11 + * New filters to take advantage of spam headers |
From: Sandy M. <san...@us...> - 2004-05-03 21:06:24
|
Update of /cvsroot/gatormail/GatorMail In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32577 Modified Files: build.xml Log Message: Updated VERSION to 1.0.11 Index: build.xml =================================================================== RCS file: /cvsroot/gatormail/GatorMail/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** build.xml 12 Apr 2004 20:29:53 -0000 1.12 --- build.xml 3 May 2004 21:05:42 -0000 1.13 *************** *** 6,11 **** <!-- Give user a chance to override without editing this file (and without typing -D each time it compiles it) --> - <property file=".gatormail.properties"/> <property file="${user.home}/.gatormail.properties"/> <!-- Defaults for build, put local values for these in one of the files --> --- 6,11 ---- <!-- Give user a chance to override without editing this file (and without typing -D each time it compiles it) --> <property file="${user.home}/.gatormail.properties"/> + <property file=".gatormail.properties"/> <!-- Defaults for build, put local values for these in one of the files --> *************** *** 20,24 **** <property name="gatormail.attachment.path" value="" description="Local path to hold attachments until they are sent."/> ! <property name="VERSION" value="1.0.11-dev"/> <tstamp/> --- 20,24 ---- <property name="gatormail.attachment.path" value="" description="Local path to hold attachments until they are sent."/> ! <property name="VERSION" value="1.0.11"/> <tstamp/> |
From: Sandy M. <san...@us...> - 2004-04-27 21:44:26
|
Update of /cvsroot/gatormail/GatorMail/src/webapp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13797/src/webapp Modified Files: test.jsp Log Message: show http headers Index: test.jsp =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/test.jsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** test.jsp 9 Feb 2004 23:08:49 -0000 1.1.1.1 --- test.jsp 27 Apr 2004 21:44:14 -0000 1.2 *************** *** 8,12 **** java.util.ArrayList, java.util.List, ! java.util.Iterator"%> <%@page contentType="text/html"%> <%@taglib uri="/tags/struts-bean" prefix="bean"%> --- 8,13 ---- java.util.ArrayList, java.util.List, ! java.util.Iterator, ! java.util.Enumeration"%> <%@page contentType="text/html"%> <%@taglib uri="/tags/struts-bean" prefix="bean"%> *************** *** 22,25 **** --- 23,30 ---- </head> <body> + <ul> + <%= listHeaders(request) %> + </ul> + <hr/> <% String lines = "This is a test. This is only a test.\n"; *************** *** 33,36 **** --- 38,57 ---- </html> <%! + private static String listHeaders(HttpServletRequest request) { + String out = ""; + + Enumeration enum = request.getHeaderNames(); + while (enum.hasMoreElements()) { + String heeaderName = (String) enum.nextElement(); + Enumeration enum2 = request.getHeaders(heeaderName); + while (enum2.hasMoreElements()) { + out += "<li>" + heeaderName + ": "; + out += enum2.nextElement(); + out += "</li>\n"; + } + } + return out; + } + private static String wrapLines(String body) throws IOException { StringBuffer buff = new StringBuffer(body.length()); |
From: Sandy M. <san...@us...> - 2004-04-27 21:43:49
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13666/src/java/edu/ufl/osg/webmail/util Modified Files: NoCacheFilter.java Log Message: Try some new caching logic for IE Index: NoCacheFilter.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/util/NoCacheFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NoCacheFilter.java 29 Mar 2004 21:07:10 -0000 1.2 --- NoCacheFilter.java 27 Apr 2004 21:43:37 -0000 1.3 *************** *** 27,30 **** --- 27,31 ---- import javax.servlet.FilterChain; import javax.servlet.http.HttpServletResponse; + import javax.servlet.http.HttpServletRequest; import java.io.IOException; *************** *** 43,53 **** public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { ! if (response instanceof HttpServletResponse) { ! HttpServletResponse httpResponse = (HttpServletResponse)response; httpResponse.addHeader("Cache-Control", "no-cache"); httpResponse.addHeader("Pragma", "no-cache"); - //httpResponse.addDateHeader("Expires", System.currentTimeMillis()); } chain.doFilter(request, response); } --- 44,56 ---- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { ! HttpServletRequest httpRequest = (HttpServletRequest) request; ! HttpServletResponse httpResponse = (HttpServletResponse)response; + if (httpRequest.getRequestURI().indexOf("attachment.do") == -1) { httpResponse.addHeader("Cache-Control", "no-cache"); httpResponse.addHeader("Pragma", "no-cache"); } + //httpResponse.addDateHeader("Expires", System.currentTimeMillis() + (10 * 1000)); // 10 seconds + chain.doFilter(request, response); } |
From: Sandy M. <san...@us...> - 2004-04-27 21:41:42
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/prefs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13196/src/java/edu/ufl/osg/webmail/prefs Modified Files: DBPrefsPlugIn.java TransientPrefsProvider.java Log Message: Remove some depreciated code that was for WebSphere Index: TransientPrefsProvider.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/prefs/TransientPrefsProvider.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TransientPrefsProvider.java 22 Feb 2004 08:00:05 -0000 1.2 --- TransientPrefsProvider.java 27 Apr 2004 21:41:31 -0000 1.3 *************** *** 1,5 **** /* * This file is part of GatorMail, a servlet based webmail. ! * Copyright (C) 2003 The Open Systems Group / University of Florida * * GatorMail is free software; you can redistribute it and/or modify --- 1,5 ---- /* * This file is part of GatorMail, a servlet based webmail. ! * Copyright (C) 2003-2004 The Open Systems Group / University of Florida * * GatorMail is free software; you can redistribute it and/or modify *************** *** 26,30 **** /** ! * TODO: Write me * * @author sandymac --- 26,30 ---- /** ! * Sets up a preferences provider that doesn't presist changes. * * @author sandymac Index: DBPrefsPlugIn.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/prefs/DBPrefsPlugIn.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DBPrefsPlugIn.java 22 Feb 2004 08:00:05 -0000 1.2 --- DBPrefsPlugIn.java 27 Apr 2004 21:41:30 -0000 1.3 *************** *** 1,5 **** /* * This file is part of GatorMail, a servlet based webmail. ! * Copyright (C) 2003 The Open Systems Group / University of Florida * * GatorMail is free software; you can redistribute it and/or modify --- 1,5 ---- /* * This file is part of GatorMail, a servlet based webmail. ! * Copyright (C) 2003-2004 The Open Systems Group / University of Florida * * GatorMail is free software; you can redistribute it and/or modify *************** *** 46,50 **** /** ! * TODO: Write me * * @author sandymac --- 46,50 ---- /** ! * Sets up a databased backed preference presistance engine. * * @author sandymac *************** *** 62,68 **** private String jdbcUrl = null; private DataSource dataSource; - private String username = null; - private String password = null; - private String passwordEncoded = null; public void init(final ActionServlet servlet, final ModuleConfig config) throws ServletException { --- 62,65 ---- *************** *** 165,168 **** --- 162,166 ---- public void destroy() { servlet.getServletContext().removeAttribute(Constants.PREFERENCES_PROVIDER); + config = null; } *************** *** 170,180 **** logger.debug("getConnection() Thread: " + Thread.currentThread().getName()); if (dataSource != null) { ! if (getUsername() == null) { ! return dataSource.getConnection(); ! } else { ! final String password = getPassword(); ! ! return dataSource.getConnection(getUsername(), password); ! } } else { return DriverManager.getConnection(getJdbcUrl()); --- 168,172 ---- logger.debug("getConnection() Thread: " + Thread.currentThread().getName()); if (dataSource != null) { ! return dataSource.getConnection(); } else { return DriverManager.getConnection(getJdbcUrl()); *************** *** 205,265 **** this.jdbcUrl = jdbcUrl; } - - /** - * @deprecated These are only temporary until we move off of WebSphere. - */ - public String getUsername() { - return username; - } - - /** - * @deprecated These are only temporary until we move off of WebSphere. - */ - public void setUsername(final String username) { - this.username = username; - } - - /** - * @deprecated These are only temporary until we move off of WebSphere. - */ - private synchronized String getPassword() { - if (getPasswordEncoded() != null) { - try { - final InputStream in = MimeUtility.decode(new ByteArrayInputStream(password.getBytes("US-ASCII")), getPasswordEncoded()); - final BufferedReader br = new BufferedReader(new InputStreamReader(in)); - // XXX This assumes there is no new line in the password. - password = br.readLine(); - br.close(); - } catch (MessagingException e) { - e.printStackTrace(); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - } - setPasswordEncoded(null); - return password; - } - - /** - * @deprecated These are only temporary until we move off of WebSphere. - */ - public synchronized void setPassword(final String password) { - this.password = password; - } - - /** - * @deprecated These are only temporary until we move off of WebSphere. - */ - private String getPasswordEncoded() { - return passwordEncoded; - } - - /** - * @deprecated These are only temporary until we move off of WebSphere. - */ - public void setPasswordEncoded(final String passwordEncoded) { - this.passwordEncoded = passwordEncoded; - } } \ No newline at end of file --- 197,199 ---- |
From: Sandy M. <san...@us...> - 2004-04-27 21:41:42
|
Update of /cvsroot/gatormail/GatorMail/src/webapp/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13196/src/webapp/WEB-INF Modified Files: struts-config.xml Log Message: Remove some depreciated code that was for WebSphere Index: struts-config.xml =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/WEB-INF/struts-config.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** struts-config.xml 19 Mar 2004 19:23:45 -0000 1.2 --- struts-config.xml 27 Apr 2004 21:41:32 -0000 1.3 *************** *** 493,500 **** <plug-in className="edu.ufl.osg.webmail.prefs.UFDBPrefsPlugIn"> <set-property property="contextName" value="java:comp/env/jdbc/osg_public"/> - <!-- // WebSphere needs these - <set-property property="username" value="@DBUSER@"/> - <set-property property="password" value="@DBCREDS@"/> - --> <set-property property="passwordEncoded" value="base64"/> </plug-in> --- 493,496 ---- |
From: Sandy M. <san...@us...> - 2004-04-21 18:12:46
|
Update of /cvsroot/gatormail/GatorMail/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12193/src Modified Files: Messages.properties Log Message: Made the message.junk.threashold.8 be less strong. Index: Messages.properties =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/Messages.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Messages.properties 20 Apr 2004 18:36:32 -0000 1.5 --- Messages.properties 21 Apr 2004 18:12:32 -0000 1.6 *************** *** 305,309 **** message.junk.threashold.6=6 message.junk.threashold.7=7 ! message.junk.threashold.8=8 Conservative, a few legit emails will be flagged message.junk.threashold.9=9 message.junk.threashold.10=10 Very conservative, most spam won't be flagged --- 305,309 ---- message.junk.threashold.6=6 message.junk.threashold.7=7 ! message.junk.threashold.8=8 Conservative, a few legit emails may be flagged message.junk.threashold.9=9 message.junk.threashold.10=10 Very conservative, most spam won't be flagged |
From: Sandy M. <san...@us...> - 2004-04-21 18:11:09
|
Update of /cvsroot/gatormail/GatorMail/src/webapp/tiles/preferences In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11822/src/webapp/tiles/preferences Modified Files: preferences.jsp Log Message: Preference view was missing a blank row between the Message List and View groups. Index: preferences.jsp =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/preferences/preferences.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** preferences.jsp 19 Apr 2004 22:29:44 -0000 1.5 --- preferences.jsp 21 Apr 2004 18:10:54 -0000 1.6 *************** *** 137,140 **** --- 137,144 ---- </tr> + <tr> + <td colspan="2"> </td> + </tr> + <tr class="subheader"> <th colspan="2" align="left">View</th> |
From: Sandy M. <san...@us...> - 2004-04-20 20:08:57
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/formatters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12072/src/java/edu/ufl/osg/webmail/formatters Modified Files: EmailFormat.java Log Message: Clost bug 900764: the name part of an email isn't trimmed for length in the view. Index: EmailFormat.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/formatters/EmailFormat.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EmailFormat.java 22 Feb 2004 08:00:04 -0000 1.2 --- EmailFormat.java 20 Apr 2004 20:08:32 -0000 1.3 *************** *** 127,132 **** // If the name (which is an address) is real long if (name.length() > 30) { ! final String left = name.substring(0, name.indexOf("@")); final String right = name.substring(name.indexOf("@") + 1, name.length()); name = left + "@"; --- 127,136 ---- // If the name (which is an address) is real long if (name.length() > 30) { ! String left = name.substring(0, name.indexOf("@")); final String right = name.substring(name.indexOf("@") + 1, name.length()); + + if (left.length() > 25) { + left = left.substring(0, 20) + "..."; + } name = left + "@"; |
From: Sandy M. <san...@us...> - 2004-04-20 19:08:29
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/prefs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32329/src/java/edu/ufl/osg/webmail/prefs Modified Files: package.html Log Message: Stuff the user's last login time in their preferences for possible future use with purging data or something. Index: package.html =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/prefs/package.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** package.html 19 Apr 2004 22:29:43 -0000 1.5 --- package.html 20 Apr 2004 19:08:10 -0000 1.6 *************** *** 61,64 **** --- 61,69 ---- </dd> + <dt>user.login.last</dt> + <dd> + The time the user last logged in. + </dd> + <dt>user.name</dt> <dd> |
From: Sandy M. <san...@us...> - 2004-04-20 19:08:29
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32329/src/java/edu/ufl/osg/webmail/actions Modified Files: ActionsUtil.java LoginAction.java Log Message: Stuff the user's last login time in their preferences for possible future use with purging data or something. Index: LoginAction.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/actions/LoginAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LoginAction.java 19 Mar 2004 20:18:33 -0000 1.4 --- LoginAction.java 20 Apr 2004 19:08:10 -0000 1.5 *************** *** 24,31 **** import edu.ufl.osg.webmail.SessionProvider; import edu.ufl.osg.webmail.User; - import edu.ufl.osg.webmail.prefs.PreferencesProvider; import edu.ufl.osg.webmail.data.DAOFactory; import edu.ufl.osg.webmail.data.UserInfoDAO; import edu.ufl.osg.webmail.data.UserInfoDAOException; import edu.ufl.osg.webmail.util.Util; import org.apache.commons.beanutils.PropertyUtils; --- 24,31 ---- import edu.ufl.osg.webmail.SessionProvider; import edu.ufl.osg.webmail.User; import edu.ufl.osg.webmail.data.DAOFactory; import edu.ufl.osg.webmail.data.UserInfoDAO; import edu.ufl.osg.webmail.data.UserInfoDAOException; + import edu.ufl.osg.webmail.prefs.PreferencesProvider; import edu.ufl.osg.webmail.util.Util; import org.apache.commons.beanutils.PropertyUtils; *************** *** 42,46 **** import javax.mail.MessagingException; import javax.mail.NoSuchProviderException; - import javax.mail.Session; import javax.mail.Store; import javax.servlet.http.HttpServletRequest; --- 42,45 ---- *************** *** 51,54 **** --- 50,54 ---- import java.net.UnknownHostException; import java.util.Properties; + import java.util.Date; *************** *** 170,173 **** --- 170,174 ---- final HttpSession session = request.getSession(); synchronized (session) { + session.setAttribute(Constants.LOGGING_IN, Boolean.TRUE); session.setAttribute(Constants.USER_KEY, user); // session.setAttribute(Constants.MAIL_SESSION_KEY, mailSession); *************** *** 184,187 **** --- 185,195 ---- } + final PreferencesProvider pp = (PreferencesProvider) getServlet().getServletContext().getAttribute(Constants.PREFERENCES_PROVIDER); + final Properties prefs = pp.getPreferences(user, session); + prefs.setProperty("user.login.last", new Date().toString()); + + updateSessionExpirationTimeout(session, prefs); + session.setAttribute(Constants.LOGGING_IN, Boolean.FALSE); + // if user's session timed out while composing a message if (session.getAttribute(Constants.SAVED_COMPOSE_FORM) != null) { *************** *** 189,194 **** } - updateSessionExpirationTimeout(user, session); - return mapping.findForward("success"); } --- 197,200 ---- *************** *** 201,208 **** * <code>user</code>. */ ! private void updateSessionExpirationTimeout(final User user, final HttpSession session) { ! final PreferencesProvider pp = (PreferencesProvider)getServlet().getServletContext().getAttribute(Constants.PREFERENCES_PROVIDER); ! ! final Properties prefs = pp.getPreferences(user, session); final String maxInactiveMultiplier = prefs.getProperty("session.maxInactive.multiplier"); if (maxInactiveMultiplier != null) { --- 207,211 ---- * <code>user</code>. */ ! private void updateSessionExpirationTimeout(final HttpSession session, final Properties prefs) { final String maxInactiveMultiplier = prefs.getProperty("session.maxInactive.multiplier"); if (maxInactiveMultiplier != null) { Index: ActionsUtil.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/actions/ActionsUtil.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ActionsUtil.java 19 Mar 2004 20:18:33 -0000 1.5 --- ActionsUtil.java 20 Apr 2004 19:08:10 -0000 1.6 *************** *** 90,97 **** if (session.isNew()) { ! logger.debug("New session: " + session.hashCode()); throw new SessionExpiredException("New session created"); } final User user = (User)session.getAttribute(Constants.USER_KEY); --- 90,101 ---- if (session.isNew()) { ! //logger.debug("New session: " + session.hashCode()); throw new SessionExpiredException("New session created"); } + if (Boolean.TRUE.equals(session.getAttribute(Constants.LOGGING_IN))) { + throw new InvalidSessionException("User trying to login in concurrently."); + } + final User user = (User)session.getAttribute(Constants.USER_KEY); |
From: Sandy M. <san...@us...> - 2004-04-20 19:08:25
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32329/src/java/edu/ufl/osg/webmail Modified Files: Constants.java Log Message: Stuff the user's last login time in their preferences for possible future use with purging data or something. Index: Constants.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/Constants.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Constants.java 22 Feb 2004 07:59:55 -0000 1.2 --- Constants.java 20 Apr 2004 19:08:10 -0000 1.3 *************** *** 44,47 **** --- 44,50 ---- public static final String USER_KEY = "user"; + /** Is this user logging in? */ + public static final String LOGGING_IN = "logging in"; + /** request scoped key for message displaying result of an action */ public static final String RESULT = "result"; |
From: Sandy M. <san...@us...> - 2004-04-20 18:36:41
|
Update of /cvsroot/gatormail/GatorMail/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25049/src Modified Files: Messages.properties Log Message: Implements the junk flag filters Index: Messages.properties =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/Messages.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Messages.properties 19 Apr 2004 22:29:43 -0000 1.4 --- Messages.properties 20 Apr 2004 18:36:32 -0000 1.5 *************** *** 170,173 **** --- 170,175 ---- folder.filter.seen=Read Messages folder.filter.replied=Replied Messages + folder.filter.flaggedJunk=Messages Flagged as Junk + folder.filter.notFlaggedJunk=Messages Not Flagged as Junk folderManage.title=Manage Folders folderManage.table.folder=Folder |
From: Sandy M. <san...@us...> - 2004-04-20 18:35:06
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24593/src/java/edu/ufl/osg/webmail/actions Modified Files: FolderAction.java Log Message: Implements the junk flag filters Index: FolderAction.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/actions/FolderAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FolderAction.java 19 Apr 2004 22:29:42 -0000 1.4 --- FolderAction.java 20 Apr 2004 18:34:57 -0000 1.5 *************** *** 42,53 **** import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMultipart; ! import javax.mail.search.AddressTerm; ! import javax.mail.search.FlagTerm; ! import javax.mail.search.FromStringTerm; ! import javax.mail.search.NotTerm; ! import javax.mail.search.OrTerm; ! import javax.mail.search.SearchTerm; ! import javax.mail.search.SubjectTerm; ! import javax.mail.search.RecipientStringTerm; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; --- 42,46 ---- import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMultipart; ! import javax.mail.search.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; *************** *** 75,79 **** static { ! List list = new ArrayList(); list.add("none"); list.add("subjectAndSender"); --- 68,72 ---- static { ! final List list = new ArrayList(); list.add("none"); list.add("subjectAndSender"); *************** *** 89,92 **** --- 82,87 ---- list.add("addressBook"); list.add("notAddressBook"); + list.add("flaggedJunk"); + list.add("notFlaggedJunk"); filterChoices = Collections.unmodifiableList(list); } *************** *** 97,110 **** * folder parameter of the request URL forward the user to their INBOX. * ! * @param mapping The ActionMapping used to select this ! * instance ! * @param form The optional ActionForm bean for this request ! * (if any) ! * @param request The HTTP request we are processing ! * @param response The HTTP response we are creating ! * @return An ActionForward instance to either their ! * inbox or the view. ! * @throws Exception if the application business logic throws an ! * exception */ public ActionForward execute(final ActionMapping mapping, final ActionForm form, final HttpServletRequest request, final HttpServletResponse response) throws Exception { --- 92,105 ---- * folder parameter of the request URL forward the user to their INBOX. * ! * @param mapping The ActionMapping used to select this ! * instance ! * @param form The optional ActionForm bean for this request ! * (if any) ! * @param request The HTTP request we are processing ! * @param response The HTTP response we are creating ! * @return An ActionForward instance to either their ! * inbox or the view. ! * @throws Exception if the application business logic throws an ! * exception */ public ActionForward execute(final ActionMapping mapping, final ActionForm form, final HttpServletRequest request, final HttpServletResponse response) throws Exception { *************** *** 112,116 **** ActionsUtil.checkSession(request); ! final FolderForm folderForm = (FolderForm)form; // Get the current Folder --- 107,111 ---- ActionsUtil.checkSession(request); ! final FolderForm folderForm = (FolderForm) form; // Get the current Folder *************** *** 123,126 **** --- 118,126 ---- } + final HttpSession session = request.getSession(); + final User user = Util.getUser(session); + final PreferencesProvider pp = (PreferencesProvider) getServlet().getServletContext().getAttribute(Constants.PREFERENCES_PROVIDER); + final Properties prefs = pp.getPreferences(user, session); + // Get valid Messages in the folder final List messageList; *************** *** 128,132 **** final Message[] messages; ! final SearchTerm searchTerms = buildSearchFilter(folderForm.getFilterType(), folderForm.getFilter(), addressBookList); if (searchTerms != null) { messages = folder.search(searchTerms); --- 128,132 ---- final Message[] messages; ! final SearchTerm searchTerms = buildSearchFilter(folderForm.getFilterType(), folderForm.getFilter(), addressBookList, prefs); if (searchTerms != null) { messages = folder.search(searchTerms); *************** *** 148,155 **** prefetchMessageEnvelopeUID(messageList, folder); - final HttpSession session = request.getSession(); - final User user = Util.getUser(session); - final PreferencesProvider pp = (PreferencesProvider)getServlet().getServletContext().getAttribute(Constants.PREFERENCES_PROVIDER); - final Properties prefs = pp.getPreferences(user, session); if (Boolean.valueOf(prefs.getProperty("folder.list.threading", "false")).booleanValue()) { prefetchThreadingMessageHeaders(messageList, folder); --- 148,151 ---- *************** *** 193,198 **** * <code>messageList</code> must be from <code>folder</code>. * ! * @param messageList the list of {@link Message} objects. ! * @param folder the folder for which to prefetch from. * @throws MessagingException if there is a problem with {@link * Folder#fetch}. --- 189,194 ---- * <code>messageList</code> must be from <code>folder</code>. * ! * @param messageList the list of {@link Message} objects. ! * @param folder the folder for which to prefetch from. * @throws MessagingException if there is a problem with {@link * Folder#fetch}. *************** *** 206,210 **** fp.add(FetchProfile.Item.ENVELOPE); fp.add(UIDFolder.FetchProfileItem.UID); ! final Message[] msgs = (Message[])messageList.toArray(new Message[] {}); folder.fetch(msgs, fp); } --- 202,206 ---- fp.add(FetchProfile.Item.ENVELOPE); fp.add(UIDFolder.FetchProfileItem.UID); ! final Message[] msgs = (Message[]) messageList.toArray(new Message[]{}); folder.fetch(msgs, fp); } *************** *** 214,219 **** * for each {@link Message}. All messages in <code>messageList</code> must be from <code>folder</code>. * ! * @param messageList the list of {@link Message} objects. ! * @param folder the folder for which to prefetch from. * @throws MessagingException if there is a problem with {@link * Folder#fetch}. --- 210,215 ---- * for each {@link Message}. All messages in <code>messageList</code> must be from <code>folder</code>. * ! * @param messageList the list of {@link Message} objects. ! * @param folder the folder for which to prefetch from. * @throws MessagingException if there is a problem with {@link * Folder#fetch}. *************** *** 228,232 **** fp.add("References"); fp.add("In-Reply-To"); ! final Message[] msgs = (Message[])messageList.toArray(new Message[] {}); folder.fetch(msgs, fp); } --- 224,228 ---- fp.add("References"); fp.add("In-Reply-To"); ! final Message[] msgs = (Message[]) messageList.toArray(new Message[]{}); folder.fetch(msgs, fp); } *************** *** 236,241 **** * {@link Message}. All messages in <code>messageList</code> must be from <code>folder</code>. * ! * @param messageList the list of {@link Message} objects. ! * @param folder the folder for which to prefetch from. * @throws MessagingException if there is a problem with {@link * Folder#fetch}. --- 232,237 ---- * {@link Message}. All messages in <code>messageList</code> must be from <code>folder</code>. * ! * @param messageList the list of {@link Message} objects. ! * @param folder the folder for which to prefetch from. * @throws MessagingException if there is a problem with {@link * Folder#fetch}. *************** *** 250,254 **** fp.add("X-Spam-Level"); //fp.add("X-Spam-Status"); ! final Message[] msgs = (Message[])messageList.toArray(new Message[] {}); folder.fetch(msgs, fp); } --- 246,250 ---- fp.add("X-Spam-Level"); //fp.add("X-Spam-Status"); ! final Message[] msgs = (Message[]) messageList.toArray(new Message[]{}); folder.fetch(msgs, fp); } *************** *** 259,263 **** while (iter.hasNext()) { try { ! if (flagMessageWithAttachments((Message)iter.next())) { msgsFlagged++; } --- 255,259 ---- while (iter.hasNext()) { try { ! if (flagMessageWithAttachments((Message) iter.next())) { msgsFlagged++; } *************** *** 274,278 **** /** - * * @param message The message to look for atachments in. * @return true if the message was flagged. --- 270,273 ---- *************** *** 295,299 **** } else if (message.isMimeType("multipart/*")) { try { ! final MimeMultipart mmp = (MimeMultipart)message.getContent(); hasAttachment = Util.hasAttachment(mmp); } catch (Exception e) { --- 290,294 ---- } else if (message.isMimeType("multipart/*")) { try { ! final MimeMultipart mmp = (MimeMultipart) message.getContent(); hasAttachment = Util.hasAttachment(mmp); } catch (Exception e) { *************** *** 318,322 **** } ! private static SearchTerm buildSearchFilter(final String type, final String filter, final List addressBookList) { SearchTerm searchTerm = null; if (filter == null || type == null) { --- 313,317 ---- } ! private static SearchTerm buildSearchFilter(final String type, final String filter, final List addressBookList, final Properties prefs) { SearchTerm searchTerm = null; if (filter == null || type == null) { *************** *** 374,378 **** final FromEmailTerm[] fromAddresses = new FromEmailTerm[addressBookList.size()]; for (int i = 0; i < fromAddresses.length; i++) { ! fromAddresses[i] = new FromEmailTerm((InternetAddress)addressBookList.get(i)); } searchTerm = new OrTerm(fromAddresses); --- 369,373 ---- final FromEmailTerm[] fromAddresses = new FromEmailTerm[addressBookList.size()]; for (int i = 0; i < fromAddresses.length; i++) { ! fromAddresses[i] = new FromEmailTerm((InternetAddress) addressBookList.get(i)); } searchTerm = new OrTerm(fromAddresses); *************** *** 384,395 **** final FromEmailTerm[] fromAddresses = new FromEmailTerm[addressBookList.size()]; for (int i = 0; i < fromAddresses.length; i++) { ! fromAddresses[i] = new FromEmailTerm((InternetAddress)addressBookList.get(i)); } searchTerm = new NotTerm(new OrTerm(fromAddresses)); } } return searchTerm; } private static class AttachmentTerm extends SearchTerm { public boolean match(final Message message) { --- 379,415 ---- final FromEmailTerm[] fromAddresses = new FromEmailTerm[addressBookList.size()]; for (int i = 0; i < fromAddresses.length; i++) { ! fromAddresses[i] = new FromEmailTerm((InternetAddress) addressBookList.get(i)); } searchTerm = new NotTerm(new OrTerm(fromAddresses)); } + + } else if (type.equals("flaggedJunk")) { + final String junkPattern = buildJunkPattern(prefs); + if (junkPattern != null) { + searchTerm = new HeaderTerm("X-Spam-Level", junkPattern); + } + + + } else if (type.equals("notFlaggedJunk")) { + final String junkPattern = buildJunkPattern(prefs); + if (junkPattern != null) { + searchTerm = new NotTerm(new HeaderTerm("X-Spam-Level", junkPattern)); + } + } return searchTerm; } + private static String buildJunkPattern(final Properties prefs) { + final int junkThreashold = Integer.valueOf(prefs.getProperty("message.junk.threashold", "8")).intValue(); + final String junkPattern; + if (junkThreashold > 0) { + junkPattern = "***************************************".substring(0, junkThreashold); + } else { + junkPattern = null; + } + return junkPattern; + } + private static class AttachmentTerm extends SearchTerm { public boolean match(final Message message) { *************** *** 423,428 **** for (int i = 0; i < address.length; i++) { if (address[i] instanceof InternetAddress) { ! final InternetAddress iAddr = (InternetAddress)address[i]; ! if (iAddr.getAddress().toLowerCase().equals(((InternetAddress)getAddress()).getAddress().toLowerCase())) { return true; } --- 443,448 ---- for (int i = 0; i < address.length; i++) { if (address[i] instanceof InternetAddress) { ! final InternetAddress iAddr = (InternetAddress) address[i]; ! if (iAddr.getAddress().toLowerCase().equals(((InternetAddress) getAddress()).getAddress().toLowerCase())) { return true; } |
From: Sandy M. <san...@us...> - 2004-04-19 22:29:53
|
Update of /cvsroot/gatormail/GatorMail/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29480/src Modified Files: Messages.properties Log Message: Implements preferences for setting the junk threashold Index: Messages.properties =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/Messages.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Messages.properties 19 Apr 2004 20:44:24 -0000 1.3 --- Messages.properties 19 Apr 2004 22:29:43 -0000 1.4 *************** *** 295,298 **** --- 295,314 ---- message.attachment.message=Attached Message message.attachment.save=Download Message + message.junk.threashold.0=Disabled, no messages flagged + message.junk.threashold.1=1 Aggressive, a lot of legit email will be flagged + message.junk.threashold.2=2 + message.junk.threashold.3=3 Somewhat aggressive + message.junk.threashold.4=4 + message.junk.threashold.5=5 Average + message.junk.threashold.6=6 + message.junk.threashold.7=7 + message.junk.threashold.8=8 Conservative, a few legit emails will be flagged + message.junk.threashold.9=9 + message.junk.threashold.10=10 Very conservative, most spam won't be flagged + message.junk.threashold.11=11 + message.junk.threashold.12=12 + message.junk.threashold.13=13 + message.junk.threashold.14=14 + message.junk.threashold.15=15 Only the most flagrant spam will be flagged messageList.unread=(Un)Read moveToFolder.result.multiple.success={0} Messages moved to {1}. *************** *** 308,311 **** --- 324,328 ---- preferences.maxInactiveMultiplier.default=default preferences.maxInactiveMultiplier.long=long + preferences.junkThreahsold.invalid=The Junk Threashold must be a whole number between 0 and 15 inclusive. prompt.username=Username prompt.password=Password |
From: Sandy M. <san...@us...> - 2004-04-19 22:29:53
|
Update of /cvsroot/gatormail/GatorMail/src/webapp/tiles/preferences In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29480/src/webapp/tiles/preferences Modified Files: preferences.jsp Log Message: Implements preferences for setting the junk threashold Index: preferences.jsp =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/preferences/preferences.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** preferences.jsp 12 Apr 2004 19:10:42 -0000 1.4 --- preferences.jsp 19 Apr 2004 22:29:44 -0000 1.5 *************** *** 1,5 **** <%@page contentType="text/html" import="java.util.List, edu.ufl.osg.webmail.util.Util, ! edu.ufl.osg.webmail.Constants"%> <%@taglib uri="/tags/struts-html" prefix="html"%> <%@taglib uri="/tags/struts-bean" prefix="bean"%> --- 1,7 ---- <%@page contentType="text/html" import="java.util.List, edu.ufl.osg.webmail.util.Util, ! edu.ufl.osg.webmail.Constants, ! java.util.ArrayList"%> ! <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@taglib uri="/tags/struts-html" prefix="html"%> <%@taglib uri="/tags/struts-bean" prefix="bean"%> *************** *** 76,80 **** email if the reciepient's email client supports it. <p> ! The image should have a size of 48x48 which means AIM icons work well. </p> </div> --- 78,83 ---- email if the reciepient's email client supports it. <p> ! The image should have a size of 48x48 which means buddy icons icons work well. <br/> ! When set a preview will be shown on the right. </p> </div> *************** *** 91,94 **** --- 94,127 ---- <tr> + <th width="20%" align="right" valign="top">Junk Mail Flag Threashold:</th> + <td> + <% + final List junkThreasholds = new ArrayList(16); + for (int i=0; i <= 15; i++) { + junkThreasholds.add("" + i); + } + pageContext.setAttribute("junkThreasholds", junkThreasholds); + %> + <html:errors property="junkThreashold"/> + <html:select property="junkThreashold"> + <c:forEach items="${junkThreasholds}" var="choice"> + <% + String choice = (String)pageContext.getAttribute("choice"); + String filterKey = "message.junk.threashold." + choice; + %> + <html:option value="<%= choice %>"><bean:message key="<%= filterKey %>"/></html:option> + </c:forEach> + </html:select> + <div class="tip"> + Set the junk score threashold to flag messages as junk. Lower threasholds <br/> + are more likely to mark a message as spam. + <p> + This setting also controls the message list view filter threashold. + </p> + </div> + </td> + </tr> + + <tr class="altrow"> <th width="20%" align="right" valign="top">Show Threads:</th> <td> |
From: Sandy M. <san...@us...> - 2004-04-19 22:29:53
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/prefs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29480/src/java/edu/ufl/osg/webmail/prefs Modified Files: package.html Log Message: Implements preferences for setting the junk threashold Index: package.html =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/prefs/package.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** package.html 19 Apr 2004 20:44:24 -0000 1.4 --- package.html 19 Apr 2004 22:29:43 -0000 1.5 *************** *** 49,53 **** Any messages with a junk score greater or equal to this threashold will be flagged at junk. A value of zero means the junk threashold is ! disabled. Default is 0. This must be parseable by {@link java.lang.Integer#parseInt(String)}. </dd> --- 49,53 ---- Any messages with a junk score greater or equal to this threashold will be flagged at junk. A value of zero means the junk threashold is ! disabled. Default is 8. This must be parseable by {@link java.lang.Integer#parseInt(String)}. </dd> |