From f60d534b73838c2f3c461b0086f6da02576697f3 Mon Sep 17 00:00:00 2001 From: click Date: Sat, 8 May 2010 05:03:32 +0200 Subject: Cleanup on some database-related files: merge some DB-related files, add some consistency to callhandles in sourcetree (M + combine MySQL-specific files into main database-files (click) + fix vcproj-files, adjust handler-function names for consistency (Machiavelli) --HG-- branch : trunk --- src/trinitycore/RASocket.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/trinitycore/RASocket.cpp') diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp index a55af0e270a..32c16d9980f 100644 --- a/src/trinitycore/RASocket.cpp +++ b/src/trinitycore/RASocket.cpp @@ -152,9 +152,9 @@ void RASocket::OnRead() AccountMgr::normalizeString(login); ///- Escape the Login to allow quotes in names - loginDatabase.escape_string(login); + LoginDatabase.escape_string(login); - QueryResult_AutoPtr result = loginDatabase.PQuery("SELECT a.id, aa.gmlevel, aa.RealmID FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE a.username = '%s'",login.c_str ()); + QueryResult_AutoPtr result = LoginDatabase.PQuery("SELECT a.id, aa.gmlevel, aa.RealmID FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE a.username = '%s'",login.c_str ()); ///- If the user is not found, deny access if(!result) @@ -200,10 +200,10 @@ void RASocket::OnRead() AccountMgr::normalizeString(login); AccountMgr::normalizeString(pw); - loginDatabase.escape_string(login); - loginDatabase.escape_string(pw); + LoginDatabase.escape_string(login); + LoginDatabase.escape_string(pw); - QueryResult_AutoPtr check = loginDatabase.PQuery( + QueryResult_AutoPtr check = LoginDatabase.PQuery( "SELECT 1 FROM account WHERE username = '%s' AND sha_pass_hash=SHA1(CONCAT('%s',':','%s'))", login.c_str(), login.c_str(), pw.c_str()); -- cgit v1.2.3