From 07aafe3748f9d6c2fa70b67564eb5d8daae45f4b Mon Sep 17 00:00:00 2001 From: SticklyMan Date: Fri, 19 Jul 2024 17:56:23 -0600 Subject: [PATCH] Fix error if xgui getbans is called without a filter parameter May reduce errors in cases of a conflicting addon --- CHANGELOG.md | 1 + lua/ulx/xgui/server/sv_bans.lua | 6 +++--- ulx.build | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a5ced2..d0fdef5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # ULX Changelog ## Upcoming - *(00/00/00)* +* [FIX] XGUI: Server error if internal bandata endpoint is called with missing parameters. ## v3.81 - *(03/24/24)* * [ADD] Added chat commands to both banid and unban. (Thanks, TheByKotik) diff --git a/lua/ulx/xgui/server/sv_bans.lua b/lua/ulx/xgui/server/sv_bans.lua index c878985..980b83f 100644 --- a/lua/ulx/xgui/server/sv_bans.lua +++ b/lua/ulx/xgui/server/sv_bans.lua @@ -105,7 +105,7 @@ function bans.init() xgui.bansbyunban = {} xgui.bansbybanlength = {} end - + local sortTypeTable = { [1] = function() -- Bans by Name @@ -149,7 +149,7 @@ function bans.init() table.sort( xgui.bansbyreason, function( a, b ) return a[2] < b[2] end ) end return xgui.bansbyreason - + end, [5] = function() -- Bans by Unban Date @@ -199,7 +199,7 @@ function bans.init() -- Default params sortType = tonumber( args[1] ) or 0 - filterString = args[2] ~= "" and string.lower( args[2] ) or nil + filterString = (args[2] ~= "" and args[2] ~= nil) and string.lower( args[2] ) or nil filterPermaBan = args[3] and tonumber( args[3] ) or 0 filterIncomplete = args[4] and tonumber( args[4] ) or 0 page = tonumber( args[5] ) or 1 diff --git a/ulx.build b/ulx.build index 504d9ce..c4da17c 100644 --- a/ulx.build +++ b/ulx.build @@ -1 +1 @@ -1711264842 +1721433383