Fix typo. Pointed by Aokromes, thx :)
--HG-- branch : trunk
This commit is contained in:
@@ -40,8 +40,8 @@ AccountOpResult AccountMgr::CreateAccount(std::string username, std::string pass
|
|||||||
if(utf8length(username) > MAX_ACCOUNT_STR)
|
if(utf8length(username) > MAX_ACCOUNT_STR)
|
||||||
return AOR_NAME_TOO_LONG; // username's too long
|
return AOR_NAME_TOO_LONG; // username's too long
|
||||||
|
|
||||||
normilizeString(username);
|
normalizeString(username);
|
||||||
normilizeString(password);
|
normalizeString(password);
|
||||||
|
|
||||||
LoginDatabase.escape_string(username);
|
LoginDatabase.escape_string(username);
|
||||||
LoginDatabase.escape_string(password);
|
LoginDatabase.escape_string(password);
|
||||||
@@ -120,8 +120,8 @@ AccountOpResult AccountMgr::ChangeUsername(uint32 accid, std::string new_uname,
|
|||||||
if(utf8length(new_passwd) > MAX_ACCOUNT_STR)
|
if(utf8length(new_passwd) > MAX_ACCOUNT_STR)
|
||||||
return AOR_PASS_TOO_LONG;
|
return AOR_PASS_TOO_LONG;
|
||||||
|
|
||||||
normilizeString(new_uname);
|
normalizeString(new_uname);
|
||||||
normilizeString(new_passwd);
|
normalizeString(new_passwd);
|
||||||
|
|
||||||
LoginDatabase.escape_string(new_uname);
|
LoginDatabase.escape_string(new_uname);
|
||||||
LoginDatabase.escape_string(new_passwd);
|
LoginDatabase.escape_string(new_passwd);
|
||||||
@@ -141,7 +141,7 @@ AccountOpResult AccountMgr::ChangePassword(uint32 accid, std::string new_passwd)
|
|||||||
if (utf8length(new_passwd) > MAX_ACCOUNT_STR)
|
if (utf8length(new_passwd) > MAX_ACCOUNT_STR)
|
||||||
return AOR_PASS_TOO_LONG;
|
return AOR_PASS_TOO_LONG;
|
||||||
|
|
||||||
normilizeString(new_passwd);
|
normalizeString(new_passwd);
|
||||||
|
|
||||||
LoginDatabase.escape_string(new_passwd);
|
LoginDatabase.escape_string(new_passwd);
|
||||||
if(!LoginDatabase.PExecute("UPDATE account SET sha_pass_hash=SHA1(CONCAT(username,':','%s')) WHERE id='%d'", new_passwd.c_str(), accid))
|
if(!LoginDatabase.PExecute("UPDATE account SET sha_pass_hash=SHA1(CONCAT(username,':','%s')) WHERE id='%d'", new_passwd.c_str(), accid))
|
||||||
@@ -192,7 +192,7 @@ bool AccountMgr::GetName(uint32 acc_id, std::string &name)
|
|||||||
|
|
||||||
bool AccountMgr::CheckPassword(uint32 accid, std::string passwd)
|
bool AccountMgr::CheckPassword(uint32 accid, std::string passwd)
|
||||||
{
|
{
|
||||||
normilizeString(passwd);
|
normalizeString(passwd);
|
||||||
LoginDatabase.escape_string(passwd);
|
LoginDatabase.escape_string(passwd);
|
||||||
|
|
||||||
QueryResult *result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%d' AND sha_pass_hash=SHA1(CONCAT(username,':','%s'))", accid, passwd.c_str());
|
QueryResult *result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%d' AND sha_pass_hash=SHA1(CONCAT(username,':','%s'))", accid, passwd.c_str());
|
||||||
@@ -205,7 +205,7 @@ bool AccountMgr::CheckPassword(uint32 accid, std::string passwd)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AccountMgr::normilizeString(std::string& utf8str)
|
bool AccountMgr::normalizeString(std::string& utf8str)
|
||||||
{
|
{
|
||||||
wchar_t wstr_buf[MAX_ACCOUNT_STR+1];
|
wchar_t wstr_buf[MAX_ACCOUNT_STR+1];
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ class AccountMgr
|
|||||||
uint32 GetSecurity(uint32 acc_id);
|
uint32 GetSecurity(uint32 acc_id);
|
||||||
bool GetName(uint32 acc_id, std::string &name);
|
bool GetName(uint32 acc_id, std::string &name);
|
||||||
|
|
||||||
static bool normilizeString(std::string& utf8str);
|
static bool normalizeString(std::string& utf8str);
|
||||||
};
|
};
|
||||||
|
|
||||||
#define accmgr Trinity::Singleton<AccountMgr>::Instance()
|
#define accmgr Trinity::Singleton<AccountMgr>::Instance()
|
||||||
|
|||||||
+7
-7
@@ -1407,7 +1407,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
|
|||||||
|
|
||||||
// Check for account
|
// Check for account
|
||||||
targetAccountName = arg1;
|
targetAccountName = arg1;
|
||||||
if(!AccountMgr::normilizeString(targetAccountName))
|
if(!AccountMgr::normalizeString(targetAccountName))
|
||||||
{
|
{
|
||||||
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,targetAccountName.c_str());
|
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,targetAccountName.c_str());
|
||||||
SetSentErrorMessage(true);
|
SetSentErrorMessage(true);
|
||||||
@@ -1458,7 +1458,7 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char* args)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
std::string account_name = szAccount;
|
std::string account_name = szAccount;
|
||||||
if(!AccountMgr::normilizeString(account_name))
|
if(!AccountMgr::normalizeString(account_name))
|
||||||
{
|
{
|
||||||
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
||||||
SetSentErrorMessage(true);
|
SetSentErrorMessage(true);
|
||||||
@@ -5693,7 +5693,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char* args)
|
|||||||
switch(mode)
|
switch(mode)
|
||||||
{
|
{
|
||||||
case BAN_ACCOUNT:
|
case BAN_ACCOUNT:
|
||||||
if(!AccountMgr::normilizeString(nameOrIP))
|
if(!AccountMgr::normalizeString(nameOrIP))
|
||||||
{
|
{
|
||||||
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str());
|
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str());
|
||||||
SetSentErrorMessage(true);
|
SetSentErrorMessage(true);
|
||||||
@@ -5773,7 +5773,7 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char* args)
|
|||||||
switch(mode)
|
switch(mode)
|
||||||
{
|
{
|
||||||
case BAN_ACCOUNT:
|
case BAN_ACCOUNT:
|
||||||
if(!AccountMgr::normilizeString(nameOrIP))
|
if(!AccountMgr::normalizeString(nameOrIP))
|
||||||
{
|
{
|
||||||
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str());
|
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str());
|
||||||
SetSentErrorMessage(true);
|
SetSentErrorMessage(true);
|
||||||
@@ -5812,7 +5812,7 @@ bool ChatHandler::HandleBanInfoAccountCommand(const char* args)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
std::string account_name = cname;
|
std::string account_name = cname;
|
||||||
if(!AccountMgr::normilizeString(account_name))
|
if(!AccountMgr::normalizeString(account_name))
|
||||||
{
|
{
|
||||||
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
||||||
SetSentErrorMessage(true);
|
SetSentErrorMessage(true);
|
||||||
@@ -6185,7 +6185,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
std::string account_name = account;
|
std::string account_name = account;
|
||||||
if(!AccountMgr::normilizeString(account_name))
|
if(!AccountMgr::normalizeString(account_name))
|
||||||
{
|
{
|
||||||
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
||||||
SetSentErrorMessage(true);
|
SetSentErrorMessage(true);
|
||||||
@@ -6904,7 +6904,7 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char* args)
|
|||||||
{
|
{
|
||||||
///- Convert Account name to Upper Format
|
///- Convert Account name to Upper Format
|
||||||
account_name = szAcc;
|
account_name = szAcc;
|
||||||
if(!AccountMgr::normilizeString(account_name))
|
if(!AccountMgr::normalizeString(account_name))
|
||||||
{
|
{
|
||||||
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
||||||
SetSentErrorMessage(true);
|
SetSentErrorMessage(true);
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ bool ChatHandler::HandleAccountDeleteCommand(const char* args)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
std::string account_name = account_name_str;
|
std::string account_name = account_name_str;
|
||||||
if(!AccountMgr::normilizeString(account_name))
|
if(!AccountMgr::normalizeString(account_name))
|
||||||
{
|
{
|
||||||
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
|
||||||
SetSentErrorMessage(true);
|
SetSentErrorMessage(true);
|
||||||
@@ -221,7 +221,7 @@ bool ChatHandler::HandleAccountCreateCommand(const char* args)
|
|||||||
if(!szAcc || !szPassword)
|
if(!szAcc || !szPassword)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// normilized in accmgr.CreateAccount
|
// normalized in accmgr.CreateAccount
|
||||||
std::string account_name = szAcc;
|
std::string account_name = szAcc;
|
||||||
std::string password = szPassword;
|
std::string password = szPassword;
|
||||||
|
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ void RASocket::OnRead()
|
|||||||
std::string login = szLogin;
|
std::string login = szLogin;
|
||||||
|
|
||||||
///- Convert Account name to Upper Format
|
///- Convert Account name to Upper Format
|
||||||
AccountMgr::normilizeString(login);
|
AccountMgr::normalizeString(login);
|
||||||
|
|
||||||
///- Escape the Login to allow quotes in names
|
///- Escape the Login to allow quotes in names
|
||||||
LoginDatabase.escape_string(login);
|
LoginDatabase.escape_string(login);
|
||||||
@@ -191,8 +191,8 @@ void RASocket::OnRead()
|
|||||||
std::string login = szLogin;
|
std::string login = szLogin;
|
||||||
std::string pw = &buff[5];
|
std::string pw = &buff[5];
|
||||||
|
|
||||||
AccountMgr::normilizeString(login);
|
AccountMgr::normalizeString(login);
|
||||||
AccountMgr::normilizeString(pw);
|
AccountMgr::normalizeString(pw);
|
||||||
LoginDatabase.escape_string(login);
|
LoginDatabase.escape_string(login);
|
||||||
LoginDatabase.escape_string(pw);
|
LoginDatabase.escape_string(pw);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user