Skip to content

Commit d0417b0

Browse files
committed
admin2: Fix search pattern escape
1 parent 2633362 commit d0417b0

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

[admin]/admin2/client/main/admin_acl.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ function aAclTab.RefreshUsersList()
314314
for i,user in ipairs(cache) do
315315
local row = guiGridListAddRow(aAclTab.Users)
316316

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

342-
if ((search and (resource:gsub('resource.',''):lower():find(searchText))) or not search) then
342+
if ((search and (resource:gsub('resource.',''):lower():find(searchText, 1, true))) or not search) then
343343
guiGridListSetItemText(aAclTab.Resources, row, 1, resource, false, false)
344344
end
345345
end

[admin]/admin2/client/main/admin_players.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ function aPlayersTab.Refresh()
537537
guiSetProperty(aPlayersTab.PlayerList, "SortDirection", "None")
538538
for id, player in ipairs(getElementsByType("player")) do
539539
local name = getPlayerName(player)
540-
if name:find(filter) or name:lower():find(filter) then
540+
if name:find(filter, 1, true) or name:lower():find(filter, 1, true) then
541541
if (strip) then
542542
name = stripColorCodes(name)
543543
end

[admin]/admin2/client/main/admin_resources.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ function aResourcesTab.listResources(type)
238238
filter = nil
239239
end
240240
for id, resource in ipairs(temp) do
241-
if (filter and resource.name:lower():find(filter:lower())) or (not filter) then
241+
if (filter and resource.name:lower():find(filter:lower(), 1, true)) or (not filter) then
242242
guiGridListAddRow(resources, resource.name, resource.state)
243243
end
244244
end

[admin]/admin2/client/widgets/admin_interior.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function aInterior.Refresh()
117117
guiGridListClear(aInterior.List)
118118
guiSetProperty(aInterior.List, "SortDirection", "None")
119119
for k, v in ipairs(aInterior.interiors) do
120-
if v.world:find(filter) or v.id:lower():find(filter) then
120+
if v.world:find(filter, 1, true) or v.id:lower():find(filter, 1, true) then
121121
local row = guiGridListAddRow(aInterior.List)
122122
guiGridListSetItemText(aInterior.List, row, 1, v.world, false, true)
123123
guiGridListSetItemText(aInterior.List, row, 2, v.id, false, false)

[admin]/admin2/client/widgets/admin_skin.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ function aSkin.Refresh()
155155
local skins = {}
156156
for name, group in pairs(aSkin.skins) do
157157
for _, skin in ipairs(group) do
158-
if skin.model:find(filter) or skin.name:lower():find(filter) then
158+
if skin.model:find(filter, 1, true) or skin.name:lower():find(filter, 1, true) then
159159
if (not skins[name]) then
160160
skins[name] = {}
161161
end
@@ -179,7 +179,7 @@ function aSkin.Refresh()
179179
end
180180
end
181181
for model, skinName in pairs(skins) do
182-
if model:find(filter) or skinName:lower():find(filter) then
182+
if model:find(filter, 1, True) or skinName:lower():find(filter, 1, true) then
183183
local row = guiGridListAddRow(aSkin.List)
184184
guiGridListSetItemText(aSkin.List, row, 1, model, false, true)
185185
guiGridListSetItemText(aSkin.List, row, 2, skinName, false, false)

[admin]/admin2/client/widgets/admin_vehicle.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function aVehicle.Refresh()
151151
local vehicles = {}
152152
for name, group in pairs(aVehicle.vehicles) do
153153
for _, vehicle in ipairs(group) do
154-
if vehicle.id:find(filter) or vehicle.name:lower():find(filter) then
154+
if vehicle.id:find(filter, 1, true) or vehicle.name:lower():find(filter, 1, true) then
155155
if (not vehicles[name]) then
156156
vehicles[name] = {}
157157
end
@@ -175,7 +175,7 @@ function aVehicle.Refresh()
175175
end
176176
end
177177
for model, vehicleName in pairs(vehicles) do
178-
if model:find(filter) or vehicleName:lower():find(filter:lower()) then
178+
if model:find(filter, 1, true) or vehicleName:lower():find(filter:lower(), 1, true) then
179179
local row = guiGridListAddRow(aVehicle.List)
180180
guiGridListSetItemText(aVehicle.List, row, 1, model, false, true)
181181
guiGridListSetItemText(aVehicle.List, row, 2, vehicleName, false, false)

[admin]/admin2/client/widgets/admin_weapon.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ function aWeapon.Refresh()
162162
local weapons = {}
163163
for name, group in pairs(aWeapon.weapons) do
164164
for _, vehicle in ipairs(group) do
165-
if vehicle.id:find(filter) or vehicle.name:lower():find(filter) then
165+
if vehicle.id:find(filter, 1, true) or vehicle.name:lower():find(filter, 1, true) then
166166
if (not weapons[name]) then
167167
weapons[name] = {}
168168
end
@@ -186,7 +186,7 @@ function aWeapon.Refresh()
186186
end
187187
end
188188
for id, weaponName in pairs(weapons) do
189-
if id:find(filter) or weaponName:lower():find(filter) then
189+
if id:find(filter, 1, true) or weaponName:lower():find(filter, 1, true) then
190190
local row = guiGridListAddRow(aWeapon.List)
191191
guiGridListSetItemText(aWeapon.List, row, 1, id, false, true)
192192
guiGridListSetItemText(aWeapon.List, row, 2, weaponName, false, false)

0 commit comments

Comments
 (0)