modules/admin-full: add field validation for hostnames in leases and hosts pages

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / dhcpleases.lua

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
index 70b49d7..e0e65e5 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
@@ -12,49 +12,14 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 
-local uci = require "luci.model.uci".cursor()
 local sys = require "luci.sys"
-local wa  = require "luci.tools.webadmin"
-local fs  = require "nixio.fs"
 
 m2 = Map("dhcp", translate("DHCP Leases"),
        translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " ..
                "DHCP clients. They are also required for non-dynamic interface configurations where " ..
                "only hosts with a corresponding lease are served."))
 
-local leasefn, leasefp, leases
-uci:foreach("dhcp", "dnsmasq",
- function(section)
-       leasefn = section.leasefile
- end
-) 
-local leasefp = leasefn and fs.access(leasefn) and io.lines(leasefn)
-if leasefp then
-       leases = {}
-       for lease in leasefp do
-               table.insert(leases, luci.util.split(lease, " "))
-       end
-end
-
-if leases then
-       v = m2:section(Table, leases, translate("Active Leases"))
-
-       name = v:option(DummyValue, 4, translate("Hostname"))
-       function name.cfgvalue(self, ...)
-               local value = DummyValue.cfgvalue(self, ...)
-               return (value == "*") and "?" or value
-       end
-
-       ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
-       
-       mac  = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
-       
-       ltime = v:option(DummyValue, 1, translate("Leasetime remaining"))
-       function ltime.cfgvalue(self, ...)
-               local value = DummyValue.cfgvalue(self, ...)
-               return wa.date_format(os.difftime(tonumber(value), os.time()))
-       end
-end
+m2:section(SimpleSection).template = "admin_network/lease_status"
 
 s = m2:section(TypedSection, "host", translate("Static Leases"),
        translate("Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> " ..
@@ -66,8 +31,15 @@ s.anonymous = true
 s.template = "cbi/tblsection"
 
 name = s:option(Value, "name", translate("Hostname"))
+name.datatype = "hostname"
+name.rmempty  = true
+
 mac = s:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+mac.datatype = "macaddr"
+
 ip = s:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+ip.datatype = "ip4addr"
+
 sys.net.arptable(function(entry)
        ip:value(entry["IP address"])
        mac:value(
@@ -76,5 +48,5 @@ sys.net.arptable(function(entry)
        )
 end)
 
-       
+
 return m2