From f1f61379cab08ecff28e125cba3aa68b78fd66d7 Mon Sep 17 00:00:00 2001 From: Alexander Alexeev Date: Mon, 14 Nov 2016 16:00:58 +0700 Subject: bugfixes --- juick-www/src/main/java/com/juick/www/PM.java | 5 +++-- juick-www/src/main/java/com/juick/www/Settings.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'juick-www/src/main/java/com/juick') diff --git a/juick-www/src/main/java/com/juick/www/PM.java b/juick-www/src/main/java/com/juick/www/PM.java index f7a7f478..8190d65b 100644 --- a/juick-www/src/main/java/com/juick/www/PM.java +++ b/juick-www/src/main/java/com/juick/www/PM.java @@ -20,6 +20,7 @@ package com.juick.www; import com.juick.server.PMQueries; import com.juick.server.TagQueries; 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; @@ -69,7 +70,7 @@ public class PM { List msgs = PMQueries.getLastPMSent(sql, visitor.getUID()); String uname = request.getParameter("uname"); - if (!UserQueries.checkUserNameValid(uname)) { + if (!UserUtils.checkUserNameValid(uname)) { uname = ""; } @@ -92,7 +93,7 @@ public class PM { uname = uname.substring(1); } int uid = 0; - if (UserQueries.checkUserNameValid(uname)) { + if (UserUtils.checkUserNameValid(uname)) { uid = UserQueries.getUIDbyName(sql, uname); } diff --git a/juick-www/src/main/java/com/juick/www/Settings.java b/juick-www/src/main/java/com/juick/www/Settings.java index 8fe14615..6be16acc 100644 --- a/juick-www/src/main/java/com/juick/www/Settings.java +++ b/juick-www/src/main/java/com/juick/www/Settings.java @@ -23,6 +23,7 @@ import com.juick.server.TagQueries; import com.juick.server.UserQueries; import com.juick.server.helpers.NotifyOpts; import com.juick.server.helpers.UserInfo; +import com.juick.util.UserUtils; import com.mitchellbosecke.pebble.error.PebbleException; import com.mitchellbosecke.pebble.template.PebbleTemplate; import net.coobird.thumbnailator.Thumbnails; @@ -199,7 +200,7 @@ public class Settings { sql.queryForObject("SELECT authcode FROM auth WHERE user_id=? AND protocol='email' " + "AND account=?", String.class, visitor.getUID(), request.getParameter("account")); } catch (EmptyResultDataAccessException e) { - String authCode = UserQueries.generateHash(8); + String authCode = UserUtils.generateHash(8); if (sql.update("INSERT INTO auth(user_id,protocol,account,authcode) VALUES (?,'email',?,?)", visitor.getUID(), request.getParameter("account"), authCode) > 0) { Session session = Session.getDefaultInstance(System.getProperties()); -- cgit v1.2.3