Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

applications/luci-ddns: Add more datatype checks and defaults

Browse source
This commit is contained in:
Manuel Munz 2013-09-16 19:51:25 +00:00
parent 637997309e
commit a4c083ecef
1 changed files with 42 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
View file

@ -3,6 +3,7 @@ LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -10,14 +11,10 @@ You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
$Id$
]]-- ]]--
require("luci.tools.webadmin") require("luci.tools.webadmin")
local is_mini = (luci.dispatcher.context.path[1] == "mini")
m = Map("ddns", translate("Dynamic DNS"), m = Map("ddns", translate("Dynamic DNS"),
translate("Dynamic DNS allows that your router can be reached with " .. translate("Dynamic DNS allows that your router can be reached with " ..
"a fixed hostname while having a dynamically changing " .. "a fixed hostname while having a dynamically changing " ..
@ -29,12 +26,9 @@ s.anonymous = false
s:option(Flag, "enabled", translate("Enable")) s:option(Flag, "enabled", translate("Enable"))
interface = s:option(ListValue, "interface", translate("Event interface"), translate("On which interface up should start the ddns script process."))
luci.tools.webadmin.cbi_add_networks(interface)
interface.default = "wan"
svc = s:option(ListValue, "service_name", translate("Service")) svc = s:option(ListValue, "service_name", translate("Service"))
svc.rmempty = false svc.rmempty = false
svc.default = "dyndns.org"
local services = { } local services = { }
local fd = io.open("/usr/lib/ddns/services", "r") local fd = io.open("/usr/lib/ddns/services", "r")
@ -72,51 +66,54 @@ end
svc:value("-", "-- "..translate("custom").." --") svc:value("-", "-- "..translate("custom").." --")
url = s:option(Value, "update_url", translate("Custom update-URL")) local url = s:option(Value, "update_url", translate("Custom update-URL"))
url:depends("service_name", "-") url:depends("service_name", "-")
url.rmempty = true url.rmempty = true
s:option(Value, "domain", translate("Hostname")).rmempty = true local hostname = s:option(Value, "domain", translate("Hostname"))
s:option(Value, "username", translate("Username")).rmempty = true hostname.rmempty = true
pw = s:option(Value, "password", translate("Password")) hostname.default = "mypersonaldomain.dyndns.org"
hostname.datatype = "host"
local username = s:option(Value, "username", translate("Username"))
username.rmempty = true
local pw = s:option(Value, "password", translate("Password"))
pw.rmempty = true pw.rmempty = true
pw.password = true pw.password = true
require("luci.tools.webadmin")
if is_mini then local src = s:option(ListValue, "ip_source",
s.defaults.ip_source = "network" translate("Source of IP address"))
s.defaults.ip_network = "wan" src.default = "network"
else src:value("network", translate("network"))
src:value("interface", translate("interface"))
src:value("web", translate("URL"))
src = s:option(ListValue, "ip_source", local iface = s:option(ListValue, "ip_network", translate("Network"))
translate("Source of IP address")) iface:depends("ip_source", "network")
src:value("network", translate("network")) iface.rmempty = true
src:value("interface", translate("interface")) iface.default = "wan"
src:value("web", translate("URL")) luci.tools.webadmin.cbi_add_networks(iface)
iface = s:option(ListValue, "ip_interface", translate("Interface"))
iface = s:option(ListValue, "ip_network", translate("Network")) iface:depends("ip_source", "interface")
iface:depends("ip_source", "network") iface.rmempty = true
iface.rmempty = true for k, v in pairs(luci.sys.net.devices()) do
luci.tools.webadmin.cbi_add_networks(iface) iface:value(v)
iface = s:option(ListValue, "ip_interface", translate("Interface"))
iface:depends("ip_source", "interface")
iface.rmempty = true
for k, v in pairs(luci.sys.net.devices()) do
iface:value(v)
end
web = s:option(Value, "ip_url", translate("URL"))
web:depends("ip_source", "web")
web.rmempty = true
end end
local web = s:option(Value, "ip_url", translate("URL"))
web:depends("ip_source", "web")
web.default = "http://checkip.dyndns.com/"
web.rmempty = true
ci = s:option(Value, "check_interval", translate("Check for changed IP every"))
local ci = s:option(Value, "check_interval", translate("Check for changed IP every"))
ci.datatype = "and(uinteger,min(1))" ci.datatype = "and(uinteger,min(1))"
ci.default = 10 ci.default = 10
unit = s:option(ListValue, "check_unit", translate("Check-time unit")) local unit = s:option(ListValue, "check_unit", translate("Check-time unit"))
unit.default = "minutes" unit.default = "minutes"
unit:value("minutes", translate("min")) unit:value("minutes", translate("min"))
unit:value("hours", translate("h")) unit:value("hours", translate("h"))
@ -125,7 +122,7 @@ fi = s:option(Value, "force_interval", translate("Force update every"))
fi.datatype = "and(uinteger,min(1))" fi.datatype = "and(uinteger,min(1))"
fi.default = 72 fi.default = 72
unit = s:option(ListValue, "force_unit", translate("Force-time unit")) local unit = s:option(ListValue, "force_unit", translate("Force-time unit"))
unit.default = "hours" unit.default = "hours"
unit:value("minutes", translate("min")) unit:value("minutes", translate("min"))
unit:value("hours", translate("h")) unit:value("hours", translate("h"))