From 8ffb0e9925281eb32d525196a81c68232518665e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 29 Mar 2010 21:34:45 +0000 Subject: [PATCH] applications/luci-ddns: merge mini and full models, read services from /usr/lib/ddns/services, patch by joda (#99) --- applications/luci-ddns/luasrc/controller/ddns.lua | 2 +- .../luci-ddns/luasrc/model/cbi/ddns/ddns.lua | 81 ++++++++++++++-------- .../luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua | 52 -------------- 3 files changed, 54 insertions(+), 81 deletions(-) delete mode 100644 applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua diff --git a/applications/luci-ddns/luasrc/controller/ddns.lua b/applications/luci-ddns/luasrc/controller/ddns.lua index e425dbc5c..8e1bc665a 100644 --- a/applications/luci-ddns/luasrc/controller/ddns.lua +++ b/applications/luci-ddns/luasrc/controller/ddns.lua @@ -26,7 +26,7 @@ function index() page.dependent = true - local page = entry({"mini", "network", "ddns"}, cbi("ddns/ddnsmini", {autoapply=true}), luci.i18n.translate("Dynamic DNS"), 60) + local page = entry({"mini", "network", "ddns"}, cbi("ddns/ddns", {autoapply=true}), luci.i18n.translate("Dynamic DNS"), 60) page.i18n = "ddns" page.dependent = true end diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua index d0faff624..ada0ee12c 100644 --- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua +++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua @@ -12,22 +12,38 @@ You may obtain a copy of the License at $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 IP-Address.")) s = m:section(TypedSection, "service", "") s.addremove = true +s.anonymous = false s:option(Flag, "enabled", translate("enable")) -svc = s:option(ListValue, "service_name", translate("Service")) +svc = s:option(Value, "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 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 + s:option(Value, "domain", translate("Hostname")).rmempty = true s:option(Value, "username", translate("Username")).rmempty = true @@ -35,28 +51,37 @@ 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) -end -web = s:option(Value, "ip_url", "URL") -web:depends("ip_source", "web") -web.rmempty = true +if is_mini then + s.defaults.ip_source = "network" + s.defaults.ip_network = "wan" +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") + + 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", "URL") + web:depends("ip_source", "web") + web.rmempty = true + + s:option(Value, "update_url", translate("Custom Update-URL")).optional = true +end -s:option(Value, "update_url", translate("Custom Update-URL")).optional = true s:option(Value, "check_interval", translate("Check for changed IP every")).default = 10 unit = s:option(ListValue, "check_unit", translate("Check-Time unit")) diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua deleted file mode 100644 index 886053b1b..000000000 --- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua +++ /dev/null @@ -1,52 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2008 Steven Barth -Copyright 2008 Jo-Philipp Wich - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ -]]-- -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:option(Flag, "enabled", translate("enable")) - -svc = s:option(ListValue, "service_name", translate("Service")) -svc.rmempty = true -svc:value("dyndns.org") -svc:value("changeip.com") -svc:value("zoneedit.com") -svc:value("no-ip.com") -svc:value("freedns.afraid.org") - -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 - -s.defaults.ip_source = "network" -s.defaults.ip_network = "wan" - -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") - -s:option(Value, "force_interval", translate("Force update every")).default = 72 -unit = s:option(ListValue, "force_unit", translate("Force-Time unit")) -unit.default = "hours" -unit:value("minutes", "min") -unit:value("hours", "h") - - -return m -- 2.11.0