X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-ddns%2Fluasrc%2Fmodel%2Fcbi%2Fddns%2Fddns.lua;h=e477a245ec00abbaa4df98686a5a0dab0c9b6bef;hp=d0faff624b76ad82a9f62f6dd57eaec27688dbd6;hb=839dcdc01299869bc714990c19d8e244f18318b5;hpb=e60a81aa8cab93d695e8b5cf71d9db87d9aad07d

diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
index d0faff624b..e477a245ec 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
@@ -12,22 +12,69 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 require("luci.tools.webadmin")
-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."))
+
+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."))
 
 s = m:section(TypedSection, "service", "")
 s.addremove = true
+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.rmempty = true
-svc:value("")
-svc:value("dyndns.org")
-svc:value("changeip.com")
-svc:value("zoneedit.com")
-svc:value("no-ip.com")
-svc:value("freedns.afraid.org")
+svc.rmempty = false
+
+local services = { }
+local fd = io.open("/usr/lib/ddns/services", "r")
+if fd then
+	local ln
+	repeat
+		ln = fd:read("*l")
+		local s = ln and ln:match('^%s*"([^"]+)"')
+		if s then services[#services+1] = s end
+	until not ln
+	fd:close()
+end
+
+local v
+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
@@ -35,40 +82,53 @@ pw = s:option(Value, "password", translate("Password"))
 pw.rmempty = true
 pw.password = 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", "URL")
-
-iface = s:option(ListValue, "ip_network", translate("Network"))
-iface:depends("ip_source", "network")
-iface.rmempty = true
-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)
+
+if is_mini then
+	s.defaults.ip_source = "network"
+	s.defaults.ip_network = "wan"
+else
+
+	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)
+
+	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
 
-web = s:option(Value, "ip_url", "URL")
-web:depends("ip_source", "web")
-web.rmempty = true
 
-s:option(Value, "update_url", translate("Custom Update-URL")).optional = true
+ci = s:option(Value, "check_interval", translate("Check for changed IP every"))
+ci.datatype = "and(uinteger,min(1))"
+ci.default = 10
 
-s:option(Value, "check_interval", translate("Check for changed IP every")).default = 10
-unit = s:option(ListValue, "check_unit", translate("Check-Time unit"))
+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"))
+
+fi = s:option(Value, "force_interval", translate("Force update every"))
+fi.datatype = "and(uinteger,min(1))"
+fi.default = 72
 
-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