From 50cfeb9aa406b9f81a6aa51dcd87201e5f3bae1e Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 23 Jun 2018 21:31:09 +0200 Subject: Core/Misc: Improved ip2location code and set it to disabled by default (cherry picked from commit 0ead73516adfeaff96292685592085e20737d535) --- src/server/scripts/Commands/cs_account.cpp | 4 ++-- src/server/scripts/Commands/cs_misc.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 2cb4ef8f0a3..f162b6465be 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -291,10 +291,10 @@ public: { if (param == "on") { - if (IpLocationRecord* location = sIPLocation->GetData(handler->GetSession()->GetRemoteAddress())) + if (IpLocationRecord const* location = sIPLocation->GetLocationRecord(handler->GetSession()->GetRemoteAddress())) { PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_ACCOUNT_LOCK_COUNTRY); - stmt->setString(0, location->country_code); + stmt->setString(0, location->CountryCode); stmt->setUInt32(1, handler->GetSession()->GetAccountId()); LoginDatabase.Execute(stmt); handler->PSendSysMessage(LANG_COMMAND_ACCLOCKLOCKED); diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 417153bfeff..56b7071a8a8 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1769,10 +1769,10 @@ public: lastIp = fields[4].GetString(); lastLogin = fields[5].GetString(); - if (IpLocationRecord* location = sIPLocation->GetData(lastIp)) + if (IpLocationRecord const* location = sIPLocation->GetLocationRecord(lastIp)) { lastIp.append(" ("); - lastIp.append(location->country_name); + lastIp.append(location->CountryName); lastIp.append(")"); } } -- cgit v1.2.3