diff --git a/htroot/Blog.java b/htroot/Blog.java index 3af51689f..b5570e20f 100644 --- a/htroot/Blog.java +++ b/htroot/Blog.java @@ -78,11 +78,7 @@ public class Blog { final boolean xml = (header.get(HeaderFramework.CONNECTION_PROP_PATH)).endsWith(".xml"); final String address = sb.peers.mySeed().getPublicAddress(); - if(hasRights) { - prop.put("mode_admin", "1"); - } else { - prop.put("mode_admin", "0"); - } + prop.put("mode_admin", hasRights ? "1" : "0"); if (post == null) { prop.putHTML("peername", sb.peers.mySeed().getName()); @@ -106,22 +102,22 @@ public class Blog { String pagename = post.get("page", DEFAULT_PAGE); final String ip = header.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, "127.0.0.1"); - String StrAuthor = post.get("author", ""); + String strAuthor = post.get("author", "anonymous"); - if ("anonymous".equals(StrAuthor)) { - StrAuthor = sb.blogDB.guessAuthor(ip); + if ("anonymous".equals(strAuthor)) { + strAuthor = sb.blogDB.guessAuthor(ip); - if (StrAuthor == null || StrAuthor.length() == 0) { + if (strAuthor == null || strAuthor.length() == 0) { if (sb.peers.mySeed() == null) { - StrAuthor = "anonymous"; + strAuthor = "anonymous"; } else { - StrAuthor = sb.peers.mySeed().get("Name", "anonymous"); + strAuthor = sb.peers.mySeed().get("Name", "anonymous"); } } } byte[] author; - author = UTF8.getBytes(StrAuthor); + author = UTF8.getBytes(strAuthor); if (hasRights && post.containsKey("delete") && "sure".equals(post.get("delete"))) { page = sb.blogDB.readBlogEntry(pagename); @@ -165,7 +161,7 @@ public class Blog { final Map map = new HashMap(); map.put("page", pagename); map.put("subject", StrSubject.replace(',', ' ')); - map.put("author", StrAuthor.replace(',', ' ')); + map.put("author", strAuthor.replace(',', ' ')); sb.peers.newsPool.publishMyNews(sb.peers.mySeed(), NewsPool.CATEGORY_BLOG_ADD, map); } } diff --git a/htroot/BlogComments.java b/htroot/BlogComments.java index 60808486c..53fe6eb6e 100644 --- a/htroot/BlogComments.java +++ b/htroot/BlogComments.java @@ -52,6 +52,8 @@ import de.anomic.server.serverSwitch; public class BlogComments { + private static final String DEFAULT_PAGE = "blog_default"; + public static String dateString(final Date date) { return Blog.dateString(date); } @@ -72,32 +74,31 @@ public class BlogComments { final UserDB.Entry userentry = sb.userDB.proxyAuth(header.get(RequestHeader.AUTHORIZATION, "xxxxxx")); if (userentry != null && userentry.hasRight(UserDB.AccessRight.BLOG_RIGHT)) { hasRights = true; - } - //opens login window if login link is clicked - else if (post.containsKey("login")) { + } else if (post.containsKey("login")) { + //opens login window if login link is clicked prop.put("AUTHENTICATE","admin log-in"); } } - final String pagename = post.get("page", "blog_default"); + String pagename = post.get("page", DEFAULT_PAGE); final String ip = post.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, "127.0.0.1"); - String StrAuthor = post.get("author", "anonymous"); + String strAuthor = post.get("author", "anonymous"); - if ("anonymous".equals(StrAuthor)) { - StrAuthor = sb.blogDB.guessAuthor(ip); + if ("anonymous".equals(strAuthor)) { + strAuthor = sb.blogDB.guessAuthor(ip); - if (StrAuthor == null || StrAuthor.length() == 0) { + if (strAuthor == null || strAuthor.length() == 0) { if (sb.peers.mySeed() == null) { - StrAuthor = "anonymous"; + strAuthor = "anonymous"; } else { - StrAuthor = sb.peers.mySeed().get("Name", "anonymous"); + strAuthor = sb.peers.mySeed().get("Name", "anonymous"); } } } byte[] author; - author = UTF8.getBytes(StrAuthor); + author = UTF8.getBytes(strAuthor); final BlogBoard.BlogEntry page = sb.blogDB.readBlogEntry(pagename); //maybe "if(page == null)" final boolean pageExists = sb.blogDB.contains(pagename); @@ -127,13 +128,13 @@ public class BlogComments { sb.blogCommentDB.write(sb.blogCommentDB.newEntry(commentID, subject, author, ip, date, content)); prop.putHTML("LOCATION","BlogComments.html?page=" + pagename); - MessageBoard.entry msgEntry = null; - sb.messageDB.write(msgEntry = sb.messageDB.newEntry( + MessageBoard.entry msgEntry = sb.messageDB.newEntry( "blogComment", - StrAuthor, + strAuthor, sb.peers.mySeed().hash, sb.peers.mySeed().getName(), sb.peers.mySeed().hash, - "new blog comment: " + UTF8.String(blogEntry.getSubject()), content)); + "new blog comment: " + UTF8.String(blogEntry.getSubject()), content); + sb.messageDB.write(msgEntry); messageForwardingViaEmail(sb, msgEntry);