diff options
| author | Steven Barth <steven@midlink.org> | 2008-05-25 17:00:30 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-05-25 17:00:30 +0000 |
| commit | 365d80765d3f08c457b0a373c395c8e1940e44be (patch) | |
| tree | 480def5c83ea3df918179e26019cc93e585eda78 /applications/sgi-haserl | |
| parent | c6c50b3ec60b284107f459e5923c146d515afd2a (diff) | |
Renamed FFLuCI to LuCI, ffluci to luci and Freifunk Lua Configuration Interface to Lua Configuration Interface
Diffstat (limited to 'applications/sgi-haserl')
| -rwxr-xr-x | applications/sgi-haserl/root/www/cgi-bin/ffluci | 3 | ||||
| -rwxr-xr-x | applications/sgi-haserl/root/www/cgi-bin/index.cgi | 2 | ||||
| -rwxr-xr-x | applications/sgi-haserl/root/www/cgi-bin/luci | 3 | ||||
| -rwxr-xr-x | applications/sgi-haserl/root/www/cgi-bin/luci-upload (renamed from applications/sgi-haserl/root/www/cgi-bin/ffluci-upload) | 2 | ||||
| -rw-r--r-- | applications/sgi-haserl/root/www/index.html | 2 | ||||
| -rw-r--r-- | applications/sgi-haserl/src/sgi/haserl.lua | 46 |
6 files changed, 29 insertions, 29 deletions
diff --git a/applications/sgi-haserl/root/www/cgi-bin/ffluci b/applications/sgi-haserl/root/www/cgi-bin/ffluci deleted file mode 100755 index f3d85df64..000000000 --- a/applications/sgi-haserl/root/www/cgi-bin/ffluci +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/haserl --shell=luac -require("ffluci.dispatcher").createindex() -ffluci.dispatcher.httpdispatch()
\ No newline at end of file diff --git a/applications/sgi-haserl/root/www/cgi-bin/index.cgi b/applications/sgi-haserl/root/www/cgi-bin/index.cgi index 31705ccf2..aae8591c6 100755 --- a/applications/sgi-haserl/root/www/cgi-bin/index.cgi +++ b/applications/sgi-haserl/root/www/cgi-bin/index.cgi @@ -1,3 +1,3 @@ #!/usr/bin/haserl --shell=luac print("Status: 302 Found") -print("Location: ffluci\n") +print("Location: luci\n") diff --git a/applications/sgi-haserl/root/www/cgi-bin/luci b/applications/sgi-haserl/root/www/cgi-bin/luci new file mode 100755 index 000000000..8b06527a0 --- /dev/null +++ b/applications/sgi-haserl/root/www/cgi-bin/luci @@ -0,0 +1,3 @@ +#!/usr/bin/haserl --shell=luac +require("luci.dispatcher").createindex() +luci.dispatcher.httpdispatch()
\ No newline at end of file diff --git a/applications/sgi-haserl/root/www/cgi-bin/ffluci-upload b/applications/sgi-haserl/root/www/cgi-bin/luci-upload index c31ddb822..371967ce9 100755 --- a/applications/sgi-haserl/root/www/cgi-bin/ffluci-upload +++ b/applications/sgi-haserl/root/www/cgi-bin/luci-upload @@ -1,4 +1,4 @@ #!/usr/bin/haserl --shell=luac --upload-limit=16384 -- This is a bit hacky: remove -upload from SCRIPT_NAME ENV.SCRIPT_NAME = ENV.SCRIPT_NAME:sub(1, #ENV.SCRIPT_NAME - 7) -dofile("ffluci")
\ No newline at end of file +dofile("luci")
\ No newline at end of file diff --git a/applications/sgi-haserl/root/www/index.html b/applications/sgi-haserl/root/www/index.html index 58387a5fe..39ba558df 100644 --- a/applications/sgi-haserl/root/www/index.html +++ b/applications/sgi-haserl/root/www/index.html @@ -5,6 +5,6 @@ <meta http-equiv="refresh" content="0; URL=/cgi-bin/index.cgi" /> </head> <body style="background-color: black"> -<a style="color: white; text-decoration: none" href="/cgi-bin/index.cgi">FFLuCI - Freifunk Lua Configuration Interface</a> +<a style="color: white; text-decoration: none" href="/cgi-bin/index.cgi">LuCI - Lua Configuration Interface</a> </body> </html>
\ No newline at end of file diff --git a/applications/sgi-haserl/src/sgi/haserl.lua b/applications/sgi-haserl/src/sgi/haserl.lua index f3a6ee613..f3994b5c8 100644 --- a/applications/sgi-haserl/src/sgi/haserl.lua +++ b/applications/sgi-haserl/src/sgi/haserl.lua @@ -1,5 +1,5 @@ --[[ -FFLuCI - SGI-Module for Haserl +LuCI - SGI-Module for Haserl Description: Server Gateway Interface for Haserl @@ -23,30 +23,30 @@ See the License for the specific language governing permissions and limitations under the License. ]]-- -module("ffluci.sgi.haserl", package.seeall) -require("ffluci.fs") +module("luci.sgi.haserl", package.seeall) +require("luci.fs") -- Environment Table -ffluci.http.env = ENV +luci.http.env = ENV -- Returns the main dispatcher URL -function ffluci.http.dispatcher() - return ffluci.http.env.SCRIPT_NAME or "" +function luci.http.dispatcher() + return luci.http.env.SCRIPT_NAME or "" end -- Returns the upload dispatcher URL -function ffluci.http.dispatcher_upload() - return ffluci.http.dispatcher() .. "-upload" +function luci.http.dispatcher_upload() + return luci.http.dispatcher() .. "-upload" end -- Returns a table of all COOKIE, GET and POST Parameters -function ffluci.http.formvalues() +function luci.http.formvalues() return FORM end -- Gets form value from key -function ffluci.http.formvalue(key, default) - local c = ffluci.http.formvalues() +function luci.http.formvalue(key, default) + local c = luci.http.formvalues() for match in key:gmatch("[%w-_]+") do c = c[match] @@ -59,39 +59,39 @@ function ffluci.http.formvalue(key, default) end -- Gets a table of values with a certain prefix -function ffluci.http.formvaluetable(prefix) - return ffluci.http.formvalue(prefix, {}) +function luci.http.formvaluetable(prefix) + return luci.http.formvalue(prefix, {}) end -- Sends a custom HTTP-Header -function ffluci.http.header(key, value) +function luci.http.header(key, value) print(key .. ": " .. value) end -- Set Content-Type -function ffluci.http.prepare_content(type) +function luci.http.prepare_content(type) print("Content-Type: "..type.."\n") end -- Asks the browser to redirect to "url" -function ffluci.http.redirect(url) - ffluci.http.status(302, "Found") - ffluci.http.header("Location", url) +function luci.http.redirect(url) + luci.http.status(302, "Found") + luci.http.header("Location", url) print() end -- Returns the path of an uploaded file -- WARNING! File uploads can be easily spoofed! Do additional sanity checks! -function ffluci.http.upload(name) - local fpath = ffluci.http.formvalue(name) - local fname = ffluci.http.formvalue(name .. "_name") +function luci.http.upload(name) + local fpath = luci.http.formvalue(name) + local fname = luci.http.formvalue(name .. "_name") - if fpath and fname and ffluci.fs.isfile(fpath) then + if fpath and fname and luci.fs.isfile(fpath) then return fpath end end -- Sets HTTP-Status-Header -function ffluci.http.status(code, message) +function luci.http.status(code, message) print("Status: " .. tostring(code) .. " " .. message) end |