fozland
/
memorandum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added string format for formspec compatibility and securized S's outputs 

- Added a little hack to handle errors when S returns nil (it was noticed with Unicode characters)
 - Added a step before using strings from fields to make them compatible with formspecs (escapes)
master
LeMagnesium 2015-08-09 19:12:03 +02:00
parent ff23ac1c8e
commit 971e82df55
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
memorandum/init.lua
View File

@ -73,8 +73,8 @@ minetest.register_node("memorandum:letter_empty", {
return
end
local meta = minetest.get_meta(pos)
fields.text = fields.text
fields.signed = fields.signed
fields.text = minetest.formspec_escape(fields.text) or ""
fields.signed = minetest.formspec_escape(fields.signed) or ""
--[[print((sender:get_player_name() or "").." wrote \""..fields.text..
"\" to paper at "..minetest.pos_to_string(pos))]]
local fdir = minetest.get_node(pos).param2
@ -178,8 +178,8 @@ minetest.register_node("memorandum:letter_written", {
local item = sender:get_wielded_item()
if item:get_name() == "memorandum:eraser" then
local meta = minetest.get_meta(pos)
fields.text = fields.text
fields.signed = fields.signed
fields.text = minetest.format_escape(fields.text) or ""
fields.signed = minetest.format_escape(fields.signed) or ""
--[[print((sender:get_player_name() or "").." wrote \""..fields.text..
"\" to paper at "..minetest.pos_to_string(pos))]]
local fdir = minetest.get_node(pos).param2
@ -188,8 +188,8 @@ minetest.register_node("memorandum:letter_written", {
end
meta:set_string("text", fields.text)
meta:set_string("signed", "")
meta:set_string("infotext", S('%s %s" Unsigned'):format(info,fields.text))
if fields.signed ~= "" then
meta:set_string("infotext", (S('%s %s" Unsigned') or '%s %s" Unsigned'):format(info,fields.text))
if fields.signed and fields.signed ~= "" then
meta:set_string("signed", fields.signed)
meta:set_string("infotext", info..fields.text..sign..fields.signed)
end