From 4264e6b7808066686223d0294bd01a84659f9f38 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 7 May 2008 20:23:42 +0000 Subject: * Last API changes before 0.4 API softfreeze --- module/admin-core/src/controller/splash/splash.lua | 2 +- module/public-core/src/view/sudo_status/iwconfig.htm | 2 +- module/public-core/src/view/sudo_status/iwscan.htm | 2 +- module/rpc-core/src/controller/rpc/luciinfo.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'module') 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 %> 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") -- cgit v1.2.3