nalc/xban2
1
0
Fork 0
forked from minetest-mods/xban2
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nalc:fa14efa9e23b409b5f1435b01182a913c091d1dc
Branches Tags
nalc:master
nalc:nalc-1.2.0 nalc:nalc-1.0
...
compare: nalc:nalc-1.2.0
Branches Tags
nalc:master minetest-mods:master minetest-mods:new_auth
nalc:nalc-1.2.0 nalc:nalc-1.0

9 Commits
fa14efa9e2 ... nalc-1.2.0

Author SHA1 Message Date
sys4
1faa658651 Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-06-14 23:11:26 +02:00
sfan5
d2cda4f73a Improve behavior of GUI search field 2020-06-02 13:09:52 +02:00
sys4
72a99b2b18 Merge branch 'master' of yunohost:minetest-mods/xban2 into nalc-1.2-dev 2019-12-22 16:08:18 +01:00
sfan5
37cdbf014e Fix list of names in log message upon (un-)banning 2019-11-05 16:49:50 +01:00
sys4
43acd1c620 Merge branch 'master' into nalc-1.2 2019-05-10 02:25:27 +02:00
sys4-fr
58e77ad16c Ajoute message de chargement du mod dans le journal "action" 2019-01-19 20:40:01 +01:00
sys4-fr
af26ae75bd Merge branch 'master' into nalc 2019-01-19 20:34:30 +01:00
Dorian Wouters
8fde3c240f Fix error when using an auth handler not providing enumerate_auths 2016-08-25 23:11:49 +02:00
Dorian Wouters
d200b342e9 Use auth_handler's enumerate_auths (not auth_table) if available 2016-08-23 01:36:57 +02:00
2 changed files with 15 additions and 4 deletions
Expand all files Collapse all files

5
gui.lua
View File

@ -61,7 +61,8 @@ local function make_fs(name)
"size[16,12]", "size[16,12]",
"label[0,-.1;Filter]", "label[0,-.1;Filter]",
"field[1.5,0;12.8,1;filter;;"..ESC(filter).."]", "field[1.5,0;12.8,1;filter;;"..ESC(filter).."]",
"button[14,-.3;2,1;search;Search]", "field_close_on_enter[filter;false]",
"button[14,-.3;2,1;search_submit;Search]",
} }
local fsn = #fs local fsn = #fs
fsn=fsn+1 fs[fsn] = format("textlist[0,.8;4,9.3;player;%s;%d;0]", fsn=fsn+1 fs[fsn] = format("textlist[0,.8;4,9.3;player;%s;%d;0]",
@ -122,7 +123,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end end
return return
end end
if fields.search then if fields.search_submit or fields.filter then
local filter = fields.filter or "" local filter = fields.filter or ""
state.filter = filter state.filter = filter
state.list = make_list(filter) state.list = make_list(filter)

14
init.lua
View File

@ -40,6 +40,14 @@ local function parse_time(t) --> secs
return secs return secs
end end
local function concat_keys(t, sep)
local keys = {}
for k, _ in pairs(t) do
keys[#keys + 1] = k
end
return table.concat(keys, sep)
end
function xban.find_entry(player, create) --> entry, index function xban.find_entry(player, create) --> entry, index
for index, e in ipairs(db) do for index, e in ipairs(db) do
for name in pairs(e.names) do for name in pairs(e.names) do
@ -111,7 +119,7 @@ function xban.ban_player(player, source, expires, reason) --> bool, err
end end
ACTION("%s bans %s until %s for reason: %s", source, player, ACTION("%s bans %s until %s for reason: %s", source, player,
date, reason) date, reason)
ACTION("Banned Names/IPs: %s", table.concat(e.names, ", ")) ACTION("Banned Names/IPs: %s", concat_keys(e.names, ", "))
return true return true
end end
@ -131,7 +139,7 @@ function xban.unban_player(player, source) --> bool, err
e.expires = nil e.expires = nil
e.time = nil e.time = nil
ACTION("%s unbans %s", source, player) ACTION("%s unbans %s", source, player)
ACTION("Unbanned Names/IPs: %s", table.concat(e.names, ", ")) ACTION("Unbanned Names/IPs: %s", concat_keys(e.names, ", "))
return true return true
end end
@ -408,3 +416,5 @@ minetest.after(1, check_temp_bans)
dofile(xban.MP.."/dbimport.lua") dofile(xban.MP.."/dbimport.lua")
dofile(xban.MP.."/gui.lua") dofile(xban.MP.."/gui.lua")
minetest.log("action", "[xban2] loaded.")