summaryrefslogtreecommitdiffhomepage
path: root/libs
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-06-29 14:42:53 +0000
committerSteven Barth <steven@midlink.org>2008-06-29 14:42:53 +0000
commitee324cb3a70d39dc9522a1ee63af12137d433533 (patch)
tree564544d3e6bff5e916d77a427bba6b1536ba7c94 /libs
parent4c7df626b2a27e9bea4793c96929de17f38e7bd2 (diff)
* applications/luci-splash: Rewrote luci-splash using an own daemon implementation
* Minor tweaks in luci.dispatcher
Diffstat (limited to 'libs')
-rwxr-xr-xlibs/sgi-cgi/htdocs/cgi-bin/index.cgi3
-rw-r--r--libs/sgi-cgi/htdocs/index.html6
-rw-r--r--libs/web/luasrc/dispatcher.lua7
3 files changed, 4 insertions, 12 deletions
diff --git a/libs/sgi-cgi/htdocs/cgi-bin/index.cgi b/libs/sgi-cgi/htdocs/cgi-bin/index.cgi
deleted file mode 100755
index fc1148de6..000000000
--- a/libs/sgi-cgi/htdocs/cgi-bin/index.cgi
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/lua
-print("Status: 302 Found")
-print("Location: luci\n")
diff --git a/libs/sgi-cgi/htdocs/index.html b/libs/sgi-cgi/htdocs/index.html
index 39ba558df..0a7238b55 100644
--- a/libs/sgi-cgi/htdocs/index.html
+++ b/libs/sgi-cgi/htdocs/index.html
@@ -2,9 +2,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="refresh" content="0; URL=/cgi-bin/index.cgi" />
+<meta http-equiv="refresh" content="0; URL=/cgi-bin/luci" />
</head>
<body style="background-color: black">
-<a style="color: white; text-decoration: none" href="/cgi-bin/index.cgi">LuCI - Lua Configuration Interface</a>
+<a style="color: white; text-decoration: none" href="/cgi-bin/luci">LuCI - Lua Configuration Interface</a>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 426dd66bd..7c28f6a78 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -314,7 +314,7 @@ end
-- Shortcut for creating a dispatching node
function entry(path, target, title, order)
- local c = node(path)
+ local c = node(unpack(path))
c.target = target
c.title = title
@@ -328,11 +328,6 @@ end
function node(...)
local c = context.tree
arg.n = nil
- if arg[1] then
- if type(arg[1]) == "table" then
- arg = arg[1]
- end
- end
for k,v in ipairs(arg) do
if not c.nodes[v] then