From bb1226d30fd7f00ef34c20676fc919f8659e5bf5 Mon Sep 17 00:00:00 2001 From: Jackz Date: Thu, 3 Jun 2021 19:10:03 -0500 Subject: [PATCH] globalbans: use expired vcolumn --- plugins/globalbans.smx | Bin 6075 -> 6016 bytes scripting/globalbans.sp | 16 +++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/plugins/globalbans.smx b/plugins/globalbans.smx index 42addf39236ea722e449b88b4543c67da1d8cf11..0e79e277399854a67fa4eb7542bfb835a060b091 100644 GIT binary patch delta 5861 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 diff --git a/scripting/globalbans.sp b/scripting/globalbans.sp index 5447ad3..c342d0f 100644 --- a/scripting/globalbans.sp +++ b/scripting/globalbans.sp @@ -61,7 +61,7 @@ public void OnClientAuthorized(int client, const char[] auth) { if(!StrEqual(auth, "BOT", true)) { char query[256], ip[32]; GetClientIP(client, ip, sizeof(ip)); - Format(query, sizeof(query), "SELECT `reason`, `steamid`, `expires` FROM `bans` WHERE `steamid` = '%s' OR ip = '?'", auth, ip); + Format(query, sizeof(query), "SELECT `reason`, `steamid`, `expired` FROM `bans` WHERE `steamid` = '%s' OR ip = '?'", auth, ip); g_db.Query(DB_OnConnectCheck, query, GetClientUserId(client), DBPrio_High); } } @@ -154,18 +154,16 @@ public void DB_OnConnectCheck(Database db, DBResultSet results, const char[] err //No failure, check the data. if(results.RowCount > 0 && client) { results.FetchRow(); - char reason[128], expiresDate[64], steamid[32]; - DBResult result; + char reason[128], steamid[64]; + DBResult reasonResult; results.FetchString(1, steamid, sizeof(steamid)); + bool expired = results.FetchInt(2) == 1; if(results.IsFieldNull(2)) { DeleteBan(steamid); }else{ - results.FetchString(0, reason, sizeof(reason), result); - results.FetchString(2, expiresDate, sizeof(expiresDate)); - - int expires = StringToInt(expiresDate); - if(expires <= GetTime() && expires > 0) { - if(result == DBVal_Data) + results.FetchString(0, reason, sizeof(reason), reasonResult); + if(!expired) { + if(reasonResult == DBVal_Data) KickClient(client, "You have been banned: %s", reason); else KickClient(client, "You have been banned from this server.");