From df529650d03296bf03ade8c0eed4a2fcc404a041 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Fri, 21 Jun 2013 00:16:11 +0700
Subject: Bugfix

---
 src/java/com/juick/api/Users.java | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'src/java/com/juick/api/Users.java')

diff --git a/src/java/com/juick/api/Users.java b/src/java/com/juick/api/Users.java
index 5810ddba..2c60a95f 100644
--- a/src/java/com/juick/api/Users.java
+++ b/src/java/com/juick/api/Users.java
@@ -21,17 +21,21 @@ public class Users {
     }
 
     public void doGetUserRead(HttpServletRequest request, HttpServletResponse response, int vuid) throws ServletException, IOException {
-        int uid = vuid;
-        String paramUID = request.getParameter("user_id");
-        if (paramUID != null) {
-            try {
-                uid = Integer.parseInt(paramUID);
-            } catch (NumberFormatException e) {
+        int uid = 0;
+        String uname = request.getParameter("uname");
+        if (uname == null) {
+            uid = vuid;
+        } else {
+            if (UserQueries.checkUserNameValid(uname)) {
+                com.juick.User u = UserQueries.getUserByNick(sql, uname);
+                if (u != null && u.UID > 0) {
+                    uid = u.UID;
+                }
             }
         }
 
         if (uid > 0) {
-            ArrayList<Integer> uids = UserQueries.getUserRead(sql, vuid);
+            ArrayList<Integer> uids = UserQueries.getUserRead(sql, uid);
             if (uids.size() > 0) {
                 ArrayList<com.juick.User> users = UserQueries.getUsersByID(sql, uids);
                 if (users.size() > 0) {
@@ -45,17 +49,21 @@ public class Users {
     }
 
     public void doGetUserReaders(HttpServletRequest request, HttpServletResponse response, int vuid) throws ServletException, IOException {
-        int uid = vuid;
-        String paramUID = request.getParameter("user_id");
-        if (paramUID != null) {
-            try {
-                uid = Integer.parseInt(paramUID);
-            } catch (NumberFormatException e) {
+        int uid = 0;
+        String uname = request.getParameter("uname");
+        if (uname == null) {
+            uid = vuid;
+        } else {
+            if (UserQueries.checkUserNameValid(uname)) {
+                com.juick.User u = UserQueries.getUserByNick(sql, uname);
+                if (u != null && u.UID > 0) {
+                    uid = u.UID;
+                }
             }
         }
 
         if (uid > 0) {
-            ArrayList<Integer> uids = UserQueries.getUserReaders(sql, vuid);
+            ArrayList<Integer> uids = UserQueries.getUserReaders(sql, uid);
             if (uids.size() > 0) {
                 ArrayList<com.juick.User> users = UserQueries.getUsersByID(sql, uids);
                 if (users.size() > 0) {
-- 
cgit v1.2.3