From 3e56a4b8d7340ff75ecdd596516370076419ce2f Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 19 Jul 2014 13:40:14 +0200 Subject: Part 1: Merge branch 'master' into 4.3.4 --- src/server/worldserver/RemoteAccess/RASession.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/server/worldserver') diff --git a/src/server/worldserver/RemoteAccess/RASession.cpp b/src/server/worldserver/RemoteAccess/RASession.cpp index 846a4eb39e3..bc15952cb37 100644 --- a/src/server/worldserver/RemoteAccess/RASession.cpp +++ b/src/server/worldserver/RemoteAccess/RASession.cpp @@ -121,7 +121,7 @@ bool RASession::CheckAccessLevel(const std::string& user) { std::string safeUser = user; - AccountMgr::normalizeString(safeUser); + Utf8ToUpperOnlyLatin(safeUser); PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_ACCOUNT_ACCESS); stmt->setString(0, safeUser); @@ -152,12 +152,10 @@ bool RASession::CheckAccessLevel(const std::string& user) bool RASession::CheckPassword(const std::string& user, const std::string& pass) { std::string safe_user = user; - std::transform(safe_user.begin(), safe_user.end(), safe_user.begin(), ::toupper); - AccountMgr::normalizeString(safe_user); + Utf8ToUpperOnlyLatin(safe_user); std::string safe_pass = pass; - AccountMgr::normalizeString(safe_pass); - std::transform(safe_pass.begin(), safe_pass.end(), safe_pass.begin(), ::toupper); + Utf8ToUpperOnlyLatin(safe_pass); std::string hash = AccountMgr::CalculateShaPassHash(safe_user, safe_pass); -- cgit v1.2.3