* Added initial version of RPC info API

[project/luci.git] / contrib / package / ffluci-splash / src / luci-splash / htdocs / cgi-bin / index.cgi

diff --git a/contrib/package/ffluci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi b/contrib/package/ffluci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi
index 4cbddc0..91a6b33 100644 (file)
--- a/contrib/package/ffluci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi
+++ b/contrib/package/ffluci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi
@@ -7,22 +7,35 @@ require("ffluci.sys")
 require("ffluci.model.uci")
 
 local srv
+local net
 local ip = ffluci.http.remote_addr()
 for k, v in pairs(ffluci.model.uci.show("network").network) do
        if v[".type"] == "interface" and v.ipaddr then
                local p = ffluci.sys.net.mask4prefix(v.netmask)
                if ffluci.sys.net.belongs(ip, v.ipaddr, p) then
+                       net = k
                        srv = v.ipaddr
                        break
                end
        end
 end
 
+local stat = false
+for k, v in pairs(ffluci.model.uci.show("luci_splash").luci_splash) do
+       if v[".type"] == "iface" and v.network == net then
+               stat = true
+       end 
+end
+
 if not srv then
        ffluci.http.textheader()
        return print("Unable to detect network settings!")
 end
 
+if not stat then
+       ffluci.http.redirect("http://" .. srv)
+end
+
 local action = "splash"
 
 local mac = ffluci.sys.net.ip4mac(ip)
@@ -30,7 +43,7 @@ if not mac then
        action = "unknown"
 end
 
-local status = ffluci.sys.exec("luci-splash status "..mac)
+local status = ffluci.sys.execl("luci-splash status "..mac)[1]
 
 if status == "whitelisted" or status == "lease" then
        action = "allowed"