Fix urltoken passing on several pages

diff --git a/libs/cbi/luasrc/view/cbi/header.htm b/libs/cbi/luasrc/view/cbi/header.htm
index 3f60baf..90b6f65 100644 (file)
--- 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 2a80723..66810a0 100644 (file)
--- 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 42f13fa..4965240 100644 (file)
--- 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 4f19f4e..ef46cb4 100644 (file)
--- 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