From 156ab97673d7552c11784d0cdd53f8f37923a294 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 10 Jul 2016 22:56:58 +0300
Subject: fix getUserByHash usage, part 2

---
 juick-www/src/main/java/com/juick/www/Home.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'juick-www/src/main/java/com/juick/www/Home.java')

diff --git a/juick-www/src/main/java/com/juick/www/Home.java b/juick-www/src/main/java/com/juick/www/Home.java
index 9241c5e6..b0013202 100644
--- a/juick-www/src/main/java/com/juick/www/Home.java
+++ b/juick-www/src/main/java/com/juick/www/Home.java
@@ -58,7 +58,7 @@ public class Home {
             title = "Поиск: " + Utils.encodeHTML(paramSearch);
             mids = MessagesQueries.getSearch(sql, sqlSearch, Utils.encodeSphinx(paramSearch), paramBefore);
         } else if (paramShow == null) {
-            if (visitor != null) {
+            if (visitor.getUID() > 0) {
                 title = "Популярные";
                 mids = MessagesQueries.getPopular(sql, visitor.getUID(), paramBefore);
             } else {
@@ -116,7 +116,7 @@ public class Home {
                 out.println("<!--noindex-->");
             }
 
-            if (visitor != null) {
+            if (visitor.getUID() > 0) {
                 out.println("<form action=\"/post\" method=\"post\" enctype=\"multipart/form-data\" onsubmit=\"return onsubmitNewMessage()\">");
                 out.println("<section id=\"newmessage\">");
                 out.println("  <textarea name=\"body\" placeholder=\"Новое сообщение...\" onclick=\"$('#newmessage>div').css('display','block');$('#newmessage textarea').css('min-height','70px');\" onkeypress=\"postformListener(this.form,event)\"></textarea>");
@@ -132,7 +132,7 @@ public class Home {
             if (mids.size() > 0) {
                 int ad_mid = 0;
                 if (paramShow == null || paramShow.equals("top") || paramShow.equals("all")) {
-                    int vuid = visitor != null ? visitor.getUID() : 0;
+                    int vuid = visitor.getUID();
                     ad_mid = AdsQueries.getAdMID(sql, vuid);
                     if (ad_mid > 0 && mids.indexOf(ad_mid) == -1) {
                         mids.add(0, ad_mid);
@@ -142,7 +142,7 @@ public class Home {
                     }
                 }
 
-                PageTemplates.printMessages(out, sql, null, mids, visitor, visitor == null ? 2 : 3, ad_mid);
+                PageTemplates.printMessages(out, sql, null, mids, visitor, visitor.getUID() == 0 ? 2 : 3, ad_mid);
             }
 
             if (mids.size() >= 20) {
-- 
cgit v1.2.3