Skip to content

admin/admin2: Fix search pattern escape #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

admin/admin2: Fix search pattern escape #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2633362
Fix search pattern escape
omar-o22 Oct 13, 2025
d0417b0
admin2: Fix search pattern escape
omar-o22 Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion [admin]/admin/client/admin_gui.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function guiListLoadItems(list)
local filter = guiGetText(listData.edit)
guiGridListClear(listData.gridlist)
for k, v in ipairs(listData.items) do
if (v.text:lower():find(filter:lower())) then
if (v.text:lower():find(filter:lower(), 1, true)) then
local row = guiGridListAddRow(listData.gridlist)
guiGridListSetItemText(listData.gridlist, row, 1, tostring ( v.text ), false, false )
guiGridListSetItemData(listData.gridlist, row, 1, tostring ( v.data ) )
Expand Down
4 changes: 2 additions & 2 deletions [admin]/admin2/client/main/admin_acl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ function aAclTab.RefreshUsersList()
for i,user in ipairs(cache) do
local row = guiGridListAddRow(aAclTab.Users)

if ((search and (user:gsub('user.',''):lower():find(searchText))) or not search) then
if ((search and (user:gsub('user.',''):lower():find(searchText, 1, true))) or not search) then
guiGridListSetItemText(aAclTab.Users, row, 1, user, false, false)
end
end
Expand All @@ -339,7 +339,7 @@ function aAclTab.RefreshResourcesList()
for i,resource in ipairs(cache) do
local row = guiGridListAddRow(aAclTab.Resources)

if ((search and (resource:gsub('resource.',''):lower():find(searchText))) or not search) then
if ((search and (resource:gsub('resource.',''):lower():find(searchText, 1, true))) or not search) then
guiGridListSetItemText(aAclTab.Resources, row, 1, resource, false, false)
end
end
Expand Down
2 changes: 1 addition & 1 deletion [admin]/admin2/client/main/admin_players.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ function aPlayersTab.Refresh()
guiSetProperty(aPlayersTab.PlayerList, "SortDirection", "None")
for id, player in ipairs(getElementsByType("player")) do
local name = getPlayerName(player)
if name:find(filter) or name:lower():find(filter) then
if name:find(filter, 1, true) or name:lower():find(filter, 1, true) then
if (strip) then
name = stripColorCodes(name)
end
Expand Down
2 changes: 1 addition & 1 deletion [admin]/admin2/client/main/admin_resources.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ function aResourcesTab.listResources(type)
filter = nil
end
for id, resource in ipairs(temp) do
if (filter and resource.name:lower():find(filter:lower())) or (not filter) then
if (filter and resource.name:lower():find(filter:lower(), 1, true)) or (not filter) then
guiGridListAddRow(resources, resource.name, resource.state)
end
end
Expand Down
2 changes: 1 addition & 1 deletion [admin]/admin2/client/widgets/admin_interior.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function aInterior.Refresh()
guiGridListClear(aInterior.List)
guiSetProperty(aInterior.List, "SortDirection", "None")
for k, v in ipairs(aInterior.interiors) do
if v.world:find(filter) or v.id:lower():find(filter) then
if v.world:find(filter, 1, true) or v.id:lower():find(filter, 1, true) then
local row = guiGridListAddRow(aInterior.List)
guiGridListSetItemText(aInterior.List, row, 1, v.world, false, true)
guiGridListSetItemText(aInterior.List, row, 2, v.id, false, false)
Expand Down
4 changes: 2 additions & 2 deletions [admin]/admin2/client/widgets/admin_skin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function aSkin.Refresh()
local skins = {}
for name, group in pairs(aSkin.skins) do
for _, skin in ipairs(group) do
if skin.model:find(filter) or skin.name:lower():find(filter) then
if skin.model:find(filter, 1, true) or skin.name:lower():find(filter, 1, true) then
if (not skins[name]) then
skins[name] = {}
end
Expand All @@ -179,7 +179,7 @@ function aSkin.Refresh()
end
end
for model, skinName in pairs(skins) do
if model:find(filter) or skinName:lower():find(filter) then
if model:find(filter, 1, True) or skinName:lower():find(filter, 1, true) then
local row = guiGridListAddRow(aSkin.List)
guiGridListSetItemText(aSkin.List, row, 1, model, false, true)
guiGridListSetItemText(aSkin.List, row, 2, skinName, false, false)
Expand Down
4 changes: 2 additions & 2 deletions [admin]/admin2/client/widgets/admin_vehicle.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function aVehicle.Refresh()
local vehicles = {}
for name, group in pairs(aVehicle.vehicles) do
for _, vehicle in ipairs(group) do
if vehicle.id:find(filter) or vehicle.name:lower():find(filter) then
if vehicle.id:find(filter, 1, true) or vehicle.name:lower():find(filter, 1, true) then
if (not vehicles[name]) then
vehicles[name] = {}
end
Expand All @@ -175,7 +175,7 @@ function aVehicle.Refresh()
end
end
for model, vehicleName in pairs(vehicles) do
if model:find(filter) or vehicleName:lower():find(filter:lower()) then
if model:find(filter, 1, true) or vehicleName:lower():find(filter:lower(), 1, true) then
local row = guiGridListAddRow(aVehicle.List)
guiGridListSetItemText(aVehicle.List, row, 1, model, false, true)
guiGridListSetItemText(aVehicle.List, row, 2, vehicleName, false, false)
Expand Down
4 changes: 2 additions & 2 deletions [admin]/admin2/client/widgets/admin_weapon.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function aWeapon.Refresh()
local weapons = {}
for name, group in pairs(aWeapon.weapons) do
for _, vehicle in ipairs(group) do
if vehicle.id:find(filter) or vehicle.name:lower():find(filter) then
if vehicle.id:find(filter, 1, true) or vehicle.name:lower():find(filter, 1, true) then
if (not weapons[name]) then
weapons[name] = {}
end
Expand All @@ -186,7 +186,7 @@ function aWeapon.Refresh()
end
end
for id, weaponName in pairs(weapons) do
if id:find(filter) or weaponName:lower():find(filter) then
if id:find(filter, 1, true) or weaponName:lower():find(filter, 1, true) then
local row = guiGridListAddRow(aWeapon.List)
guiGridListSetItemText(aWeapon.List, row, 1, id, false, true)
guiGridListSetItemText(aWeapon.List, row, 2, weaponName, false, false)
Expand Down