summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-12-22 21:54:20 +0000
committerSteven Barth <steven@midlink.org>2008-12-22 21:54:20 +0000
commit014d971eabdb4c20eb09356098ca1a87f783abe7 (patch)
treea3fec6115e1bb5b85ef839b8e0bf6c2cf5ae53f5
parent489be66e4d1634197a6975f589239f93edac54e6 (diff)
Fix urltoken passing on several pages
-rw-r--r--libs/cbi/luasrc/view/cbi/header.htm2
-rw-r--r--libs/cbi/luasrc/view/cbi/simpleform.htm2
-rw-r--r--modules/admin-core/luasrc/view/sysauth.htm2
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua6
4 files changed, 6 insertions, 6 deletions
diff --git a/libs/cbi/luasrc/view/cbi/header.htm b/libs/cbi/luasrc/view/cbi/header.htm
index 3f60baf52..90b6f659a 100644
--- a/libs/cbi/luasrc/view/cbi/header.htm
+++ b/libs/cbi/luasrc/view/cbi/header.htm
@@ -14,7 +14,7 @@ $Id$
-%>
<%+header%>
-<form method="post" action="<%=luci.http.getenv("REQUEST_URI")%>" enctype="multipart/form-data">
+<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
<div>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<input type="hidden" name="cbi.submit" value="1" />
diff --git a/libs/cbi/luasrc/view/cbi/simpleform.htm b/libs/cbi/luasrc/view/cbi/simpleform.htm
index 2a80723cb..66810a071 100644
--- a/libs/cbi/luasrc/view/cbi/simpleform.htm
+++ b/libs/cbi/luasrc/view/cbi/simpleform.htm
@@ -13,7 +13,7 @@ $Id$
-%>
-<form method="post" action="<%=luci.http.getenv("REQUEST_URI")%>">
+<form method="post" action="<%=REQUEST_URI%>">
<div>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<input type="hidden" name="cbi.submit" value="1" />
diff --git a/modules/admin-core/luasrc/view/sysauth.htm b/modules/admin-core/luasrc/view/sysauth.htm
index 42f13fa1f..49652400f 100644
--- a/modules/admin-core/luasrc/view/sysauth.htm
+++ b/modules/admin-core/luasrc/view/sysauth.htm
@@ -15,7 +15,7 @@ $Id$
<%+header%>
<% luci.i18n.loadc("sysauth") %>
-<form method="post" action="<%=luci.http.getenv("REQUEST_URI")%>">
+<form method="post" action="<%=REQUEST_URI%>">
<div class="cbi-map">
<h2><a id="content" name="content"><%:sysauth_head%></a></h2>
<div class="cbi-map-descr">
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
index 4f19f4e2c..ef46cb4a3 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
@@ -32,7 +32,7 @@ s = m:section(Table, ifaces, translate("networks"))
function s.extedit(self, section)
local device = self.map:get(section, "device") or ""
- return luci.http.getenv("REQUEST_URI") .. "/" .. device
+ return luci.dispatcher.build_url(unpack(luci.dispatcher.context.requested.path)) .. "/" .. device
end
link = s:option(DummyValue, "_link", translate("link"))
@@ -124,11 +124,11 @@ function create.write(self, section, value)
uci:load("wireless")
uci:section("wireless", "wifi-iface", nil, {device=value})
uci:save("wireless")
- luci.http.redirect(luci.http.getenv("REQUEST_URI") .. "/" .. value)
+ luci.http.redirect(luci.dispatcher.build_url(unpack(luci.dispatcher.context.requested.path)) .. "/" .. value)
end
function create.cbid(self, section)
return "priv.cbid.create"
end
-return m \ No newline at end of file
+return m