From 881bc336c1cef93d08cd1f14e37f3a3feeb07e58 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Thu, 3 Jan 2013 17:24:54 +0700
Subject: many bugfixes message number js autoselection privacy fix

---
 src/java/com/juick/http/www/Blogs.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/java/com/juick/http/www/Blogs.java')

diff --git a/src/java/com/juick/http/www/Blogs.java b/src/java/com/juick/http/www/Blogs.java
index 44c734d2..4af75cd3 100644
--- a/src/java/com/juick/http/www/Blogs.java
+++ b/src/java/com/juick/http/www/Blogs.java
@@ -92,11 +92,12 @@ public class Blogs {
         }
 
         com.juick.Place place = null;
+        int visitor_uid = visitor != null ? visitor.UID : 0;
 
         if (paramShow == null) {
             if (paramTag > 0) {
                 title = "*" + Utils.encodeHTML(paramTagStr);
-                mids = MessagesQueries.getTag(sql, paramTag, paramBefore);
+                mids = MessagesQueries.getTag(sql, paramTag, visitor_uid, paramBefore);
             } else if (paramSearch != null) {
                 title = rb.getString("Search") + ": " + Utils.encodeHTML(paramSearch);
                 mids = MessagesQueries.getSearch(sql, sqlSearch, Utils.encodeSphinx(paramSearch), paramBefore);
@@ -109,14 +110,14 @@ public class Blogs {
                 place = com.juick.server.PlacesQueries.getPlace(sql, place_id);
                 if (place != null) {
                     title = place.name;
-                    mids = MessagesQueries.getPlace(sql, place_id, paramBefore);
+                    mids = MessagesQueries.getPlace(sql, place_id, visitor_uid, paramBefore);
                 } else {
                     response.sendError(404);
                     return;
                 }
             } else {
                 title = rb.getString("Last messages");
-                mids = MessagesQueries.getAll(sql, paramBefore);
+                mids = MessagesQueries.getAll(sql, visitor_uid, paramBefore);
             }
         } else if (paramShow.equals("my")) {
             if (visitor != null) {
@@ -155,7 +156,7 @@ public class Blogs {
             mids = MessagesQueries.getPopular(sql, paramBefore);
         } else if (paramShow.equals("photos")) {
             title = rb.getString("With photos");
-            mids = MessagesQueries.getPhotos(sql, paramBefore);
+            mids = MessagesQueries.getPhotos(sql, visitor_uid, paramBefore);
         } else {
             response.sendError(404);
             return;
@@ -222,7 +223,7 @@ public class Blogs {
             out.println("</div>"); // topwrapper
 
             PageTemplates.pageDialogTemplate(out, locale);
-            PageTemplates.pageFooter(request, out, locale, visitor);
+            PageTemplates.pageFooter(request, out, locale, visitor, true);
         } finally {
             out.close();
         }
-- 
cgit v1.2.3