From 8f31704563f6e128f7197b370853502196260c0e Mon Sep 17 00:00:00 2001 From: "Eric J. Bowersox" Date: Thu, 5 Apr 2001 05:40:13 +0000 Subject: [PATCH] added one more word to the dictionary, fixed a problem with display of SIG profiles, and corrected the "new post after posting" problem (I hope). --- etc/erbo.dict | 1 + src/com/silverwrist/venice/servlets/PostMessage.java | 6 +++++- .../venice/servlets/format/PostPreview.java | 10 +++++++++- web/format/preview.jsp | 3 +++ web/format/sigprofile.jsp | 9 +++++---- web/format/slippage.jsp | 1 + 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/etc/erbo.dict b/etc/erbo.dict index 98d706a..eba346a 100644 --- a/etc/erbo.dict +++ b/etc/erbo.dict @@ -117,6 +117,7 @@ valen veni we'll we're +we've webb webbme won't diff --git a/src/com/silverwrist/venice/servlets/PostMessage.java b/src/com/silverwrist/venice/servlets/PostMessage.java index 104bf4d..355877d 100644 --- a/src/com/silverwrist/venice/servlets/PostMessage.java +++ b/src/com/silverwrist/venice/servlets/PostMessage.java @@ -112,7 +112,8 @@ public class PostMessage extends VeniceServlet if (isImageButtonClicked(request,"preview")) // generate a preview return new PostPreview(engine,sig,conf,topic,request.getParameter("pseud"),raw_postdata, request.getParameter("next"),getPostNumber(request,on_error), - yes.equals(request.getParameter("attach"))); + yes.equals(request.getParameter("attach")), + yes.equals(request.getParameter("slip"))); if ( isImageButtonClicked(request,"post") || isImageButtonClicked(request,"postnext") || isImageButtonClicked(request,"posttopics")) @@ -131,6 +132,9 @@ public class PostMessage extends VeniceServlet // post the darn thing! TopicMessageContext msg = topic.postNewMessage(0,request.getParameter("pseud"),raw_postdata); + if (!(yes.equals(request.getParameter("slip")))) + topic.fixSeen(); // no slippage = make sure we mark all as read + if (go_topics) // jump back to the topic list, puhleaze throw new RedirectResult("confdisp?sig=" + sig.getSIGID() + "&conf=" + conf.getConfID()); diff --git a/src/com/silverwrist/venice/servlets/format/PostPreview.java b/src/com/silverwrist/venice/servlets/format/PostPreview.java index 3af0eab..4bdbbac 100644 --- a/src/com/silverwrist/venice/servlets/format/PostPreview.java +++ b/src/com/silverwrist/venice/servlets/format/PostPreview.java @@ -49,6 +49,7 @@ public class PostPreview implements JSPRender private int num_errors; private int msgs; private boolean attach; + private boolean slippage; /*-------------------------------------------------------------------------------- * Constructor @@ -56,7 +57,7 @@ public class PostPreview implements JSPRender */ public PostPreview(VeniceEngine engine, SIGContext sig, ConferenceContext conf, TopicContext topic, - String pseud, String data, String next, int msgs, boolean attach) + String pseud, String data, String next, int msgs, boolean attach, boolean slippage) { this.sig = sig; this.conf = conf; @@ -64,6 +65,7 @@ public class PostPreview implements JSPRender this.next = next; this.msgs = msgs; this.attach = attach; + this.slippage = slippage; try { // sanitize the pseud data @@ -198,4 +200,10 @@ public class PostPreview implements JSPRender } // end getBodyText + public boolean slippageDetected() + { + return slippage; + + } // end slippageDetected + } // end class PostPreview diff --git a/web/format/preview.jsp b/web/format/preview.jsp index 1a68ee9..3fd11a4 100644 --- a/web/format/preview.jsp +++ b/web/format/preview.jsp @@ -45,6 +45,9 @@ <% } // end if %> + <% if (data.slippageDetected()) { %> + + <% } // end if %>
<%= rdat.getStdFontTag(null,2) %>Your name/header:
diff --git a/web/format/sigprofile.jsp b/web/format/sigprofile.jsp index 833c134..9691f96 100644 --- a/web/format/sigprofile.jsp +++ b/web/format/sigprofile.jsp @@ -50,13 +50,14 @@ <% if (data.isUserLoggedIn()) { %>
- <% if (sig.canSendInvitation()) { %> - ">" ALT="Invite" WIDTH=80 HEIGHT=24 BORDER=0> - <% } else if (sig.canJoin()) { %> + <%-- EJB 4/4/2001 - reverse these tests, put canJoin FIRST --%> + <% if (sig.canJoin()) { %> ">" ALT="Join Now" WIDTH=80 HEIGHT=24 BORDER=0> + <% } else if (sig.canSendInvitation()) { %> + ">" ALT="Invite" WIDTH=80 HEIGHT=24 BORDER=0> <% } // end if %>
<% } // end if (user is logged in) %> diff --git a/web/format/slippage.jsp b/web/format/slippage.jsp index 865bcf7..286da09 100644 --- a/web/format/slippage.jsp +++ b/web/format/slippage.jsp @@ -69,6 +69,7 @@ <% } // end if %> +
<%= rdat.getStdFontTag(null,2) %>Your name/header: