applications/luci-ddns: fix selection of custom update_url

[project/luci.git] / applications / luci-ddns / luasrc / model / cbi / ddns / ddns.lua

diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
index ada0ee1..0deb727 100644 (file)
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
@@ -16,16 +16,19 @@ $Id$
 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 IP-Address."))
+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 " ..
+               "IP address."))
 
 s = m:section(TypedSection, "service", "")
 s.addremove = true
 s.anonymous = false
 
-s:option(Flag, "enabled", translate("enable"))
+s:option(Flag, "enabled", translate("Enable"))
 
-svc = s:option(Value, "service_name", translate("Service"))
-svc.rmempty = true
+svc = s:option(ListValue, "service_name", translate("Service"))
+svc.rmempty = false
 
 local services = { }
 local fd = io.open("/usr/lib/ddns/services", "r")
@@ -44,6 +47,28 @@ for _, v in luci.util.vspairs(services) do
        svc:value(v)
 end
 
+function svc.cfgvalue(...)
+       local v = Value.cfgvalue(...)
+       if not v or #v == 0 then
+               return "-"
+       else
+               return v
+       end
+end
+
+function svc.write(self, section, value)
+       if value == "-" then
+               m.uci:delete("ddns", section, self.option)
+       else
+               Value.write(self, section, value)
+       end
+end
+
+svc:value("-", "-- "..translate("custom").." --")
+
+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
@@ -58,10 +83,11 @@ if is_mini then
 else
        require("luci.tools.webadmin")
 
-       src = s:option(ListValue, "ip_source", translate("Source of IP-Address"))
-       src:value("network", translate("Network"))
-       src:value("interface", translate("Interface"))
-       src:value("web", "URL")
+       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")
@@ -75,25 +101,24 @@ else
                iface:value(v)
        end
 
-       web = s:option(Value, "ip_url", "URL")
+       web = s:option(Value, "ip_url", translate("URL"))
        web:depends("ip_source", "web")
        web.rmempty = true
-
-       s:option(Value, "update_url", translate("Custom Update-URL")).optional = true
 end
 
 
-s:option(Value, "check_interval", translate("Check for changed IP every")).default = 10
-unit = s:option(ListValue, "check_unit", translate("Check-Time unit"))
+s:option(Value, "check_interval",
+       translate("Check for changed IP every")).default = 10
+unit = s:option(ListValue, "check_unit", translate("Check-time unit"))
 unit.default = "minutes"
-unit:value("minutes", "min")
-unit:value("hours", "h")
+unit:value("minutes", translate("min"))
+unit:value("hours", translate("h"))
 
 s:option(Value, "force_interval", translate("Force update every")).default = 72
-unit = s:option(ListValue, "force_unit", translate("Force-Time unit"))
+unit = s:option(ListValue, "force_unit", translate("Force-time unit"))
 unit.default = "hours"
-unit:value("minutes", "min")
-unit:value("hours", "h")
+unit:value("minutes", translate("min"))
+unit:value("hours", translate("h"))
 
 
 return m