jackz/sourcemod-plugins
1
0
Fork 0
mirror of https://github.com/Jackzmc/sourcemod-plugins.git synced 2025-05-06 14:03:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use db.Format methods

Browse source
This commit is contained in:
Jackzie 2024-02-15 09:00:28 -06:00
parent e8c39d87e2
commit 1032a1f9f1
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
plugins/globalbans.smx
View file

Binary file not shown.

36
scripting/globalbans.sp
View file

@ -85,8 +85,6 @@ public Action OnBanIdentity(const char[] identity, int time, int flags, const ch
executor = "CONSOLE"; executor = "CONSOLE";
} }
char query[512];
// Setup expiration date // Setup expiration date
char expiresDate[64]; char expiresDate[64];
@ -96,11 +94,18 @@ public Action OnBanIdentity(const char[] identity, int time, int flags, const ch
Format(expiresDate, sizeof(expiresDate), "NULL"); Format(expiresDate, sizeof(expiresDate), "NULL");
} }
g_db.Format(query, sizeof(query), "INSERT INTO bans" int size = 2*strlen(reason)+1;
char[] reasonEscaped = new char[size];
g_db.Escape(reason, reasonEscaped, size);
int querySize = 256+size;
char[] query = new char[querySize];
g_db.Format(query, querySize, "INSERT INTO bans"
..."(steamid, reason, expires, executor, flags, timestamp)" ..."(steamid, reason, expires, executor, flags, timestamp)"
..."VALUES ('%s', '%s', %s, '%s', %d, UNIX_TIMESTAMP())", ..."VALUES ('%s', '%s', %s, '%s', %d, UNIX_TIMESTAMP())",
identity, identity,
reason, reasonEscaped,
expiresDate, expiresDate,
executor, executor,
BANFLAG_NONE BANFLAG_NONE
@ -111,7 +116,7 @@ public Action OnBanIdentity(const char[] identity, int time, int flags, const ch
IntToString(key, strKey, sizeof(strKey)); IntToString(key, strKey, sizeof(strKey));
pendingInsertQueries.SetString(strKey, query); pendingInsertQueries.SetString(strKey, query);
g_db.Format(query, sizeof(query), "SELECT `flags` FROM `bans` WHERE `expired` = 0 AND `steamid` LIKE 'STEAM_%%:%%:%s' OR ip = '%s'", identity[10], identity); g_db.Format(query, querySize, "SELECT `flags` FROM `bans` WHERE `expired` = 0 AND `steamid` LIKE 'STEAM_%%:%%:%s' OR ip = '%s'", identity[10], identity);
g_db.Query(DB_OnBanPreCheck, query, key); g_db.Query(DB_OnBanPreCheck, query, key);
PrintToServer("Adding %s to OnBanClient queue. Key: %d", identity, key); PrintToServer("Adding %s to OnBanClient queue. Key: %d", identity, key);
@ -143,7 +148,6 @@ public Action OnBanClient(int client, int time, int flags, const char[] reason,
} }
GetClientIP(client, ip, sizeof(ip)); GetClientIP(client, ip, sizeof(ip));
char query[512];
char expiresDate[64]; char expiresDate[64];
if(time > 0) { if(time > 0) {
@ -152,12 +156,19 @@ public Action OnBanClient(int client, int time, int flags, const char[] reason,
Format(expiresDate, sizeof(expiresDate), "NULL"); Format(expiresDate, sizeof(expiresDate), "NULL");
} }
g_db.Format(query, sizeof(query), "INSERT INTO bans" int size = 2*strlen(reason)+1;
char[] reasonEscaped = new char[size];
g_db.Escape(reason, reasonEscaped, size);
int querySize = 256 + size;
char[] query = new char[querySize];
g_db.Format(query, querySize, "INSERT INTO bans"
..."(steamid, ip, reason, public_message, expires, executor, flags, timestamp)" ..."(steamid, ip, reason, public_message, expires, executor, flags, timestamp)"
..."VALUES ('%s', '%s', '%s', '%s', %s, '%s', %d, UNIX_TIMESTAMP())", ..."VALUES ('%s', '%s', '%s', '%s', %s, '%s', %d, UNIX_TIMESTAMP())",
identity, identity,
ip, ip,
reason, reasonEscaped,
kick_message, kick_message,
expiresDate, expiresDate,
executor, executor,
@ -169,14 +180,12 @@ public Action OnBanClient(int client, int time, int flags, const char[] reason,
IntToString(key, strKey, sizeof(strKey)); IntToString(key, strKey, sizeof(strKey));
pendingInsertQueries.SetString(strKey, query); pendingInsertQueries.SetString(strKey, query);
g_db.Format(query, sizeof(query), "SELECT `flags` FROM `bans` WHERE `expired` = 0 AND `steamid` LIKE 'STEAM_%%:%%:%s' OR ip = '%s'", identity[10], identity); g_db.Format(query, querySize, "SELECT `flags` FROM `bans` WHERE `expired` = 0 AND `steamid` LIKE 'STEAM_%%:%%:%s' OR ip = '%s'", identity[10], identity);
g_db.Query(DB_OnBanPreCheck, query, key); g_db.Query(DB_OnBanPreCheck, query, key);
PrintToServer("Adding %N to OnBanClient queue. Key: %d", client, key); PrintToServer("Adding %N to OnBanClient queue. Key: %d", client, key);
// TODO: REMOVE : FOR DEBUG
return Plugin_Handled; return Plugin_Handled;
return Plugin_Continue;
} }
@ -219,15 +228,16 @@ public void DB_OnBanPreCheck(Database db, DBResultSet results, const char[] erro
public void DB_OnConnectCheck(Database db, DBResultSet results, const char[] error, int user) { public void DB_OnConnectCheck(Database db, DBResultSet results, const char[] error, int user) {
int client = GetClientOfUserId(user); int client = GetClientOfUserId(user);
if(client == 0) return;
if(db == INVALID_HANDLE || results == null) { if(db == INVALID_HANDLE || results == null) {
LogError("DB_OnConnectCheck returned error: %s", error); LogError("DB_OnConnectCheck returned error: %s", error);
if(client > 0 && hKickType.IntValue == 2) { if(hKickType.IntValue == 2) {
KickClient(client, "Could not authenticate at this time."); KickClient(client, "Could not authenticate at this time.");
LogMessage("Could not connect to database to authorize user '%N' (#%d)", client, user); LogMessage("Could not connect to database to authorize user '%N' (#%d)", client, user);
} }
} else { } else {
//No failure, check the data. //No failure, check the data.
while(client > 0 && results.FetchRow()) { //Is there a ban found? while(results.FetchRow()) { //Is there a ban found?
static char reason[255], steamid[64], public_message[255]; static char reason[255], steamid[64], public_message[255];
DBResult colResult; DBResult colResult;