Adjust usages for banned_ips table to reflect Uleat's changes

This commit is contained in:
Akkadius 2019-12-24 02:59:58 -06:00
parent 72f4f10dbb
commit 20538e91a1
5 changed files with 6 additions and 6 deletions

View File

@ -124,7 +124,7 @@ uint32 Database::CheckLogin(const char* name, const char* password, const char *
//Get Banned IP Address List - Only return false if the incoming connection's IP address is not present in the banned_ips table. //Get Banned IP Address List - Only return false if the incoming connection's IP address is not present in the banned_ips table.
bool Database::CheckBannedIPs(const char* loginIP) bool Database::CheckBannedIPs(const char* loginIP)
{ {
std::string query = StringFormat("SELECT ip_address FROM Banned_IPs WHERE ip_address='%s'", loginIP); std::string query = StringFormat("SELECT ip_address FROM banned_ips WHERE ip_address='%s'", loginIP);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
@ -140,7 +140,7 @@ bool Database::CheckBannedIPs(const char* loginIP)
} }
bool Database::AddBannedIP(char* bannedIP, const char* notes) { bool Database::AddBannedIP(char* bannedIP, const char* notes) {
std::string query = StringFormat("INSERT into Banned_IPs SET ip_address='%s', notes='%s'", bannedIP, notes); std::string query = StringFormat("INSERT into banned_ips SET ip_address='%s', notes='%s'", bannedIP, notes);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return false; return false;

View File

@ -120,7 +120,7 @@ public:
/* General Information Queries */ /* General Information Queries */
bool AddBannedIP(char* bannedIP, const char* notes); //Add IP address to the Banned_IPs table. bool AddBannedIP(char* bannedIP, const char* notes); //Add IP address to the banned_ips table.
bool AddGMIP(char* ip_address, char* name); bool AddGMIP(char* ip_address, char* name);
bool CheckBannedIPs(const char* loginIP); //Check incoming connection against banned IP table. bool CheckBannedIPs(const char* loginIP); //Check incoming connection against banned IP table.
bool CheckGMIPs(const char* loginIP, uint32 account_id); bool CheckGMIPs(const char* loginIP, uint32 account_id);

View File

@ -212,7 +212,7 @@ RULE_CATEGORY_END()
RULE_CATEGORY(World) RULE_CATEGORY(World)
RULE_INT(World, ZoneAutobootTimeoutMS, 60000, "") RULE_INT(World, ZoneAutobootTimeoutMS, 60000, "")
RULE_INT(World, ClientKeepaliveTimeoutMS, 65000, "") RULE_INT(World, ClientKeepaliveTimeoutMS, 65000, "")
RULE_BOOL(World, UseBannedIPsTable, false, "Toggle whether or not to check incoming client connections against the Banned_IPs table. Set this value to false to disable this feature") RULE_BOOL(World, UseBannedIPsTable, false, "Toggle whether or not to check incoming client connections against the banned_ips table. Set this value to false to disable this feature")
RULE_BOOL(World, EnableTutorialButton, true, "") RULE_BOOL(World, EnableTutorialButton, true, "")
RULE_BOOL(World, EnableReturnHomeButton, true, "") RULE_BOOL(World, EnableReturnHomeButton, true, "")
RULE_INT(World, MaxLevelForTutorial, 10, "") RULE_INT(World, MaxLevelForTutorial, 10, "")

View File

@ -6,7 +6,7 @@ account_rewards
adventure_details adventure_details
adventure_members adventure_members
adventure_stats adventure_stats
Banned_IPs banned_ips
bugs bugs
buyer buyer
char_recipe_list char_recipe_list

View File

@ -7547,7 +7547,7 @@ void command_ipban(Client *c, const Seperator *sep)
c->Message(Chat::White, "Usage: #ipban [xxx.xxx.xxx.xxx]"); c->Message(Chat::White, "Usage: #ipban [xxx.xxx.xxx.xxx]");
} else { } else {
if(database.AddBannedIP(sep->arg[1], c->GetName())) { if(database.AddBannedIP(sep->arg[1], c->GetName())) {
c->Message(Chat::White, "%s has been successfully added to the Banned_IPs table by %s", sep->arg[1], c->GetName()); c->Message(Chat::White, "%s has been successfully added to the banned_ips table by %s", sep->arg[1], c->GetName());
} else { } else {
c->Message(Chat::White, "IPBan Failed (IP address is possibly already in the table?)"); c->Message(Chat::White, "IPBan Failed (IP address is possibly already in the table?)");
} }