From a4c083ecef6256e56a5f2809a3cebf908787afcb Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Mon, 16 Sep 2013 19:51:25 +0000 Subject: [PATCH] applications/luci-ddns: Add more datatype checks and defaults --- .../luci-ddns/luasrc/model/cbi/ddns/ddns.lua | 89 +++++++++---------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua index e477a245e..f318b1be5 100644 --- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua +++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua @@ -3,6 +3,7 @@ LuCI - Lua Configuration Interface Copyright 2008 Steven Barth Copyright 2008 Jo-Philipp Wich +Copyright 2013 Manuel Munz Licensed under the Apache License, Version 2.0 (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 -$Id$ ]]-- require("luci.tools.webadmin") -local is_mini = (luci.dispatcher.context.path[1] == "mini") - - m = Map("ddns", translate("Dynamic DNS"), translate("Dynamic DNS allows that your router can be reached with " .. "a fixed hostname while having a dynamically changing " .. @@ -29,12 +26,9 @@ s.anonymous = false 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.rmempty = false +svc.default = "dyndns.org" local services = { } local fd = io.open("/usr/lib/ddns/services", "r") @@ -72,60 +66,63 @@ end 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.rmempty = true -s:option(Value, "domain", translate("Hostname")).rmempty = true -s:option(Value, "username", translate("Username")).rmempty = true -pw = s:option(Value, "password", translate("Password")) -pw.rmempty = true -pw.password = true - +local hostname = s:option(Value, "domain", translate("Hostname")) +hostname.rmempty = true +hostname.default = "mypersonaldomain.dyndns.org" +hostname.datatype = "host" -if is_mini then - s.defaults.ip_source = "network" - s.defaults.ip_network = "wan" -else +local username = s:option(Value, "username", translate("Username")) +username.rmempty = true - src = s:option(ListValue, "ip_source", - translate("Source of IP address")) - src:value("network", translate("network")) - src:value("interface", translate("interface")) - src:value("web", translate("URL")) - - iface = s:option(ListValue, "ip_network", translate("Network")) - iface:depends("ip_source", "network") - iface.rmempty = true - luci.tools.webadmin.cbi_add_networks(iface) +local pw = s:option(Value, "password", translate("Password")) +pw.rmempty = true +pw.password = true - 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 +require("luci.tools.webadmin") - web = s:option(Value, "ip_url", translate("URL")) - web:depends("ip_source", "web") - web.rmempty = true +local src = s:option(ListValue, "ip_source", + translate("Source of IP address")) +src.default = "network" +src:value("network", translate("network")) +src:value("interface", translate("interface")) +src:value("web", translate("URL")) + +local iface = s:option(ListValue, "ip_network", translate("Network")) +iface:depends("ip_source", "network") +iface.rmempty = true +iface.default = "wan" +luci.tools.webadmin.cbi_add_networks(iface) +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 +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")) -ci.datatype = "and(uinteger,min(1))" -ci.default = 10 +local ci = s:option(Value, "check_interval", translate("Check for changed IP every")) +ci.datatype = "and(uinteger,min(1))" +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:value("minutes", translate("min")) unit:value("hours", translate("h")) -fi = s:option(Value, "force_interval", translate("Force update every")) -fi.datatype = "and(uinteger,min(1))" -fi.default = 72 +fi = s:option(Value, "force_interval", translate("Force update every")) +fi.datatype = "and(uinteger,min(1))" +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:value("minutes", translate("min")) unit:value("hours", translate("h")) -- 2.25.1