Merge branch 'nalc-1.2'

gui.lua

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

init.lua

@@ -40,14 +40,6 @@ local function parse_time(t) --> secs
 	return secs
 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
 	for index, e in ipairs(db) do
 		for name in pairs(e.names) do
@@ -119,7 +111,7 @@ function xban.ban_player(player, source, expires, reason) --> bool, err
 	end
 	ACTION("%s bans %s until %s for reason: %s", source, player,
 	  date, reason)
-	ACTION("Banned Names/IPs: %s", concat_keys(e.names, ", "))
+	ACTION("Banned Names/IPs: %s", table.concat(e.names, ", "))
 	return true
 end
 
@@ -139,7 +131,7 @@ function xban.unban_player(player, source) --> bool, err
 	e.expires = nil
 	e.time = nil
 	ACTION("%s unbans %s", source, player)
-	ACTION("Unbanned Names/IPs: %s", concat_keys(e.names, ", "))
+	ACTION("Unbanned Names/IPs: %s", table.concat(e.names, ", "))
 	return true
 end