summaryrefslogtreecommitdiffhomepage
path: root/module
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-05-07 20:23:42 +0000
committerSteven Barth <steven@midlink.org>2008-05-07 20:23:42 +0000
commit4264e6b7808066686223d0294bd01a84659f9f38 (patch)
tree4c8a26aaf40560d76cf87c85cbded37c41a49086 /module
parent54d92ebab5f402409b26a28994ed9309e47c4b41 (diff)
* Last API changes before 0.4 API softfreeze
Diffstat (limited to 'module')
-rw-r--r--module/admin-core/src/controller/splash/splash.lua2
-rw-r--r--module/public-core/src/view/sudo_status/iwconfig.htm2
-rw-r--r--module/public-core/src/view/sudo_status/iwscan.htm2
-rw-r--r--module/rpc-core/src/controller/rpc/luciinfo.lua2
4 files changed, 4 insertions, 4 deletions
diff --git a/module/admin-core/src/controller/splash/splash.lua b/module/admin-core/src/controller/splash/splash.lua
index 7e3d67ee96..62088be52d 100644
--- a/module/admin-core/src/controller/splash/splash.lua
+++ b/module/admin-core/src/controller/splash/splash.lua
@@ -1,7 +1,7 @@
module("ffluci.controller.splash.splash", package.seeall)
function action_activate()
- local mac = ffluci.sys.net.ip4mac(ffluci.http.remote_addr())
+ local mac = ffluci.sys.net.ip4mac(ffluci.http.env.REMOTE_ADDR)
if mac and ffluci.http.formvalue("accept") then
os.execute("luci-splash add "..mac.." >/dev/null 2>&1")
ffluci.http.redirect(ffluci.model.uci.get("freifunk", "community", "homepage"))
diff --git a/module/public-core/src/view/sudo_status/iwconfig.htm b/module/public-core/src/view/sudo_status/iwconfig.htm
index 92371ef603..6f5dede700 100644
--- a/module/public-core/src/view/sudo_status/iwconfig.htm
+++ b/module/public-core/src/view/sudo_status/iwconfig.htm
@@ -1,5 +1,5 @@
<%
-ffluci.http.set_content_type("text/plain")
+ffluci.http.prepare_content("text/plain")
for k, v in pairs(ffluci.sys.wifi.getiwconfig()) do
%>
<tr>
diff --git a/module/public-core/src/view/sudo_status/iwscan.htm b/module/public-core/src/view/sudo_status/iwscan.htm
index f4268574bc..6f321ae9e2 100644
--- a/module/public-core/src/view/sudo_status/iwscan.htm
+++ b/module/public-core/src/view/sudo_status/iwscan.htm
@@ -1,5 +1,5 @@
<%
-ffluci.http.set_content_type("text/plain")
+ffluci.http.prepare_content("text/plain")
for iface, cells in pairs(ffluci.sys.wifi.iwscan()) do
for i, cell in ipairs(cells) do
%>
diff --git a/module/rpc-core/src/controller/rpc/luciinfo.lua b/module/rpc-core/src/controller/rpc/luciinfo.lua
index d4e5cb3068..611423fbb0 100644
--- a/module/rpc-core/src/controller/rpc/luciinfo.lua
+++ b/module/rpc-core/src/controller/rpc/luciinfo.lua
@@ -3,7 +3,7 @@ module("ffluci.controller.rpc.luciinfo", package.seeall)
function action_index()
local uci = ffluci.model.uci.StateSession()
- ffluci.http.set_content_type("text/plain")
+ ffluci.http.prepare_content("text/plain")
-- General
print("luciinfo.api=1")