cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Bugfix for the Bugfix (#6793)

Browse Source 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
CHOMPStation2
2023-08-13 17:36:14 -07:00
committed by GitHub
parent 3e1cd79788
commit b7094b7a39
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/admin/IsBanned.dm
View File

@@ -50,7 +50,11 @@
if(computer_id)
failedcid = 0
cidquery = " OR computerid = '[sanitizeSQL(computer_id)]' "
if(isnum(text2num(computer_id)))
cidquery = " OR computerid = '[computer_id]' "
else
log_misc("Key [ckeytext] cid not checked. Non-Numeric: [computer_id]")
failedcid = 1
var/DBQuery/query = SSdbcore.NewQuery("SELECT ckey, ip, computerid, a_ckey, reason, expiration_time, duration, bantime, bantype FROM erro_ban WHERE (ckey = :t_ckey [ipquery] [cidquery]) AND (bantype = 'PERMABAN' OR (bantype = 'TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned)", list("t_ckey" = ckeytext)) //CHOMPEdit TGSQL

2
code/modules/vchat/vchat_client.dm
View File

@@ -266,7 +266,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
if(cid && !isnum(cid) && !(cid == ""))
log_and_message_admins("[key_name(owner)] - bancheck with invalid cid! ([cid])")
if(ip && !findtext(ip, new/regex("^((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}$")) && !(ip == ""))
if(ip && !findtext(ip, new/regex(@"^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$")) && !(ip == ""))
log_and_message_admins("[key_name(owner)] - bancheck with invalid ip! ([ip])")
var/list/ban = world.IsBanned(key = ckey, address = ip, computer_id = cid)