aboutsummaryrefslogtreecommitdiff
path: root/juick-api/src
diff options
context:
space:
mode:
authorGravatar Alexander Alexeev2016-11-14 16:00:58 +0700
committerGravatar Vitaly Takmazov2016-11-15 09:49:13 +0300
commitf1f61379cab08ecff28e125cba3aa68b78fd66d7 (patch)
tree95a0cc659ff850927b30c00ba7a39eadf90ec2c7 /juick-api/src
parentd03e8b19d346563afec5fb2b6b9c9dcea68040e0 (diff)
bugfixes
Diffstat (limited to 'juick-api/src')
-rw-r--r--juick-api/src/main/java/com/juick/api/PM.java3
-rw-r--r--juick-api/src/main/java/com/juick/api/Users.java5
2 files changed, 5 insertions, 3 deletions
diff --git a/juick-api/src/main/java/com/juick/api/PM.java b/juick-api/src/main/java/com/juick/api/PM.java
index 631ae978..44c43f89 100644
--- a/juick-api/src/main/java/com/juick/api/PM.java
+++ b/juick-api/src/main/java/com/juick/api/PM.java
@@ -3,6 +3,7 @@ package com.juick.api;
import com.juick.json.MessageSerializer;
import com.juick.server.PMQueries;
import com.juick.server.UserQueries;
+import com.juick.util.UserUtils;
import com.juick.xmpp.JID;
import com.juick.xmpp.Message;
import com.juick.xmpp.Stream;
@@ -57,7 +58,7 @@ public class PM {
throws ServletException, IOException {
String uname = request.getParameter("uname");
int uid = 0;
- if (UserQueries.checkUserNameValid(uname)) {
+ if (UserUtils.checkUserNameValid(uname)) {
uid = UserQueries.getUIDbyName(sql, uname);
}
diff --git a/juick-api/src/main/java/com/juick/api/Users.java b/juick-api/src/main/java/com/juick/api/Users.java
index e85c517a..2be288bc 100644
--- a/juick-api/src/main/java/com/juick/api/Users.java
+++ b/juick-api/src/main/java/com/juick/api/Users.java
@@ -3,6 +3,7 @@ package com.juick.api;
import com.juick.User;
import com.juick.json.UserSerializer;
import com.juick.server.UserQueries;
+import com.juick.util.UserUtils;
import org.springframework.jdbc.core.JdbcTemplate;
import javax.servlet.ServletException;
@@ -77,7 +78,7 @@ public class Users {
if (uname == null) {
uid = vuid;
} else {
- if (UserQueries.checkUserNameValid(uname)) {
+ if (UserUtils.checkUserNameValid(uname)) {
com.juick.User u = UserQueries.getUserByName(sql, uname);
if (u != null && u.getUID() > 0) {
uid = u.getUID();
@@ -107,7 +108,7 @@ public class Users {
if (uname == null) {
uid = vuid;
} else {
- if (UserQueries.checkUserNameValid(uname)) {
+ if (UserUtils.checkUserNameValid(uname)) {
com.juick.User u = UserQueries.getUserByName(sql, uname);
if (u != null && u.getUID() > 0) {
uid = u.getUID();