mirrors/lovebird
1
0
Fork 0
mirror of https://github.com/TangentFoxy/lovebird.git synced 2025-07-28 11:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved local loadstring -> lovebird.loadstring

Browse Source
This commit is contained in:
rxi
2014-04-15 12:42:54 +01:00
parent cc963854eb
commit 57ca73475c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lovebird.lua
View File

@@ -11,6 +11,7 @@ local socket = require "socket"
local lovebird = { _version = "0.1.0" } local lovebird = { _version = "0.1.0" }
lovebird.loadstring = loadstring or load
lovebird.inited = false lovebird.inited = false
lovebird.host = "*" lovebird.host = "*"
lovebird.buffer = "" lovebird.buffer = ""
@@ -25,12 +26,14 @@ lovebird.whitelist = { "127.0.0.1", "192.168.*.*" }
lovebird.maxlines = 200 lovebird.maxlines = 200
lovebird.updateinterval = .5 lovebird.updateinterval = .5
lovebird.pages["index"] = [[ lovebird.pages["index"] = [[
<?lua <?lua
-- Handle console input -- Handle console input
if req.parsedbody.input then if req.parsedbody.input then
local str = req.parsedbody.input local str = req.parsedbody.input
xpcall(function() assert(loadstring(str, "input"))() end, lovebird.onerror) xpcall(function() assert(lovebird.loadstring(str, "input"))() end,
lovebird.onerror)
end end
?> ?>
@@ -361,8 +364,6 @@ lovebird.pages["env.json"] = [[
]] ]]
local loadstring = loadstring or load
function lovebird.init() function lovebird.init()
-- Init server -- Init server
@@ -391,7 +392,7 @@ function lovebird.template(str, params, chunkname)
local f = function(x) return string.format(" echo(%q)", x) end local f = function(x) return string.format(" echo(%q)", x) end
str = ("?>"..str.."<?lua"):gsub("%?>(.-)<%?lua", f) str = ("?>"..str.."<?lua"):gsub("%?>(.-)<%?lua", f)
str = "local echo " .. params .. " = ..." .. str str = "local echo " .. params .. " = ..." .. str
local fn = assert(loadstring(str, chunkname)) local fn = assert(lovebird.loadstring(str, chunkname))
return function(...) return function(...)
local output = {} local output = {}
local echo = function(str) table.insert(output, str) end local echo = function(str) table.insert(output, str) end