From f71af4b67ba2bab9e3db49cf4faef081248077df Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Tue, 15 Jul 2014 16:56:56 +0700 Subject: User.Banned --- src/java/com/juick/http/www/Main.java | 4 ++-- src/java/com/juick/http/www/UserThread.java | 24 ++++++++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) (limited to 'src/java/com') diff --git a/src/java/com/juick/http/www/Main.java b/src/java/com/juick/http/www/Main.java index ec7c4e1e..e0c84734 100644 --- a/src/java/com/juick/http/www/Main.java +++ b/src/java/com/juick/http/www/Main.java @@ -217,7 +217,7 @@ public class Main extends HttpServlet implements Stream.StreamListener { } else if (uri.matches("^/.+/.*")) { String uriparts[] = uri.split("/"); com.juick.User user = com.juick.server.UserQueries.getUserByName(sql, uriparts[1]); - if (user != null && user.UName.equals(uriparts[1])) { + if (user != null && user.UName.equals(uriparts[1]) && user.Banned == false) { if (uriparts.length == 2) { // http://juick.com/username/ pagesUser.doGetBlog(sql, sqlSearch, request, response, user); } else if (uriparts[2].equals("tags")) { @@ -247,7 +247,7 @@ public class Main extends HttpServlet implements Stream.StreamListener { Errors.doGet404(sql, request, response); } } - } else if (user != null) { + } else if (user != null && user.Banned == false) { Utils.sendPermanentRedirect(response, "/" + user.UName + "/" + (uriparts.length > 2 ? uriparts[2] : "")); } else { Errors.doGet404(sql, request, response); diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java index 3b20cd76..d2b65b77 100644 --- a/src/java/com/juick/http/www/UserThread.java +++ b/src/java/com/juick/http/www/UserThread.java @@ -288,10 +288,18 @@ public class UserThread { out.print("display:none;"); } out.println("\">"); - out.println("
\""
"); + if (msg.User.Banned == false) { + out.println("
\""
"); + } else { + out.println("
"); + } out.println("
"); out.println("
"); - out.println("
@" + msg.User.UName + ":
"); + if (msg.User.Banned == false) { + out.println("
@" + msg.User.UName + ":
"); + } else { + out.println("
[banned]:
"); + } out.println("
" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString) + "
"); out.println("
" + PageTemplates.formatMessage(msg.Text) + "
"); if (msg.AttachmentType != null) { @@ -326,10 +334,18 @@ public class UserThread { com.juick.Message msg = replies.get(i); out.print("
  • "); - out.println("
    "); + if (msg.User.Banned == false) { + out.println("
    \""
    "); + } else { + out.println("
    "); + } out.println("
    "); out.println("
    "); - out.println(" "); + if (msg.User.Banned == false) { + out.println(" "); + } else { + out.println("
    [banned]:
    "); + } out.println(" "); out.println("
    " + PageTemplates.formatMessage(msg.Text) + "
    "); if (msg.AttachmentType != null) { -- cgit v1.2.3