X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-ddns%2Fluasrc%2Fmodel%2Fcbi%2Fddns%2Fddns.lua;h=9ce0c13eb5b81c89acc41eedb005e20f501c2bfe;hp=1c88579b3751cd95b217aebbcc8c7a13809c11e5;hb=157e8e52aef5ede350e17ce688f76fbaddea5dd2;hpb=5c419acf926b7332976c6a5c1586d2badf9664ae

diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
index 1c88579b3..9ce0c13eb 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 <steven@midlink.org>
 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");
 you may not use this file except in compliance with the License.
@@ -10,67 +11,125 @@ You may obtain a copy of the License at
 
 	http://www.apache.org/licenses/LICENSE-2.0
 
-$Id$
 ]]--
-m = Map("ddns", translate("ddns"), translate("ddns_desc"))
+
+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."))
 
 s = m:section(TypedSection, "service", "")
 s.addremove = true
+s.anonymous = false
+
+s:option(Flag, "enabled", translate("Enable"))
+
+interface = s:option(ListValue, "interface", translate("Event interface"), translate("Network on which the ddns-updater scripts will be started"))
+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")
+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
 
-s:option(Flag, "enabled", translate("enable"))
+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").." --")
+
+local url = s:option(Value, "update_url", translate("Custom update-URL"))
+url:depends("service_name", "-")
+url.rmempty = true
+
+local hostname = s:option(Value, "domain", translate("Hostname"))
+hostname.rmempty = true
+hostname.default = "mypersonaldomain.dyndns.org"
+hostname.datatype = "host"
 
-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")
+local username = s:option(Value, "username", translate("Username"))
+username.rmempty = true
 
-s:option(Value, "domain", translate("hostname")).rmempty = true
-s:option(Value, "username", translate("username")).rmempty = true
-s:option(Value, "password", translate("password")).rmempty = true
+local pw = s:option(Value, "password", translate("Password"))
+pw.rmempty = true
+pw.password = true
 
-src = s:option(ListValue, "ip_source")
+require("luci.tools.webadmin")
+
+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", "URL")
+src:value("web", translate("URL"))
 
-iface = s:option(ListValue, "ip_network", translate("network"))
+local iface = s:option(ListValue, "ip_network", translate("Network"))
 iface:depends("ip_source", "network")
 iface.rmempty = true
-luci.model.uci.foreach("network", "interface",
-	function (section)
-		if section[".name"] ~= "loopback" then
-			iface:value(section[".name"])
-		end
-	end)
-
-iface = s:option(ListValue, "ip_interface", translate("interface"))
+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
 
-web = s:option(Value, "ip_url", "URL")
+local web = s:option(Value, "ip_url", translate("URL"))
 web:depends("ip_source", "web")
+web.default = "http://checkip.dyndns.com/"
 web.rmempty = true
 
-s:option(Value, "update_url").optional = true
 
-s:option(Value, "check_interval").default = 10
-unit = s:option(ListValue, "check_unit")
+local ci = s:option(Value, "check_interval", translate("Check for changed IP every"))
+ci.datatype = "and(uinteger,min(1))"
+ci.default = 10
+
+local 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").default = 72
-unit = s:option(ListValue, "force_unit")
+local 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
\ No newline at end of file
+return m