From 243c3d497f6ca8f88d7a64b02f6fdd04127ca3c9 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 29 Mar 2010 21:35:29 +0000
Subject: [PATCH] luci-0.9: merge r5989
---
.../luci-ddns/luasrc/controller/ddns.lua | 2 +-
.../luci-ddns/luasrc/model/cbi/ddns/ddns.lua | 80 ++++++++++++-------
.../luasrc/model/cbi/ddns/ddnsmini.lua | 52 ------------
3 files changed, 53 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 7a81d9adf..2e93df974 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("ddns"), 60)
+ local page = entry({"mini", "network", "ddns"}, cbi("ddns/ddns", {autoapply=true}), luci.i18n.translate("ddns"), 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 45a8a3965..f0e3e0a5e 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
@@ -12,22 +12,37 @@ 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("ddns"), translate("ddns_desc"))
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 +50,37 @@ pw = s:option(Value, "password", translate("password"))
pw.rmempty = true
pw.password = true
-src = s:option(ListValue, "ip_source")
-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")
+ 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").optional = true
+end
-s:option(Value, "update_url").optional = true
s:option(Value, "check_interval").default = 10
unit = s:option(ListValue, "check_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 2a91eda82..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 <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-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("ddns"), translate("ddns_desc"))
-
-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").default = 10
-unit = s:option(ListValue, "check_unit")
-unit.default = "minutes"
-unit:value("minutes", "min")
-unit:value("hours", "h")
-
-s:option(Value, "force_interval").default = 72
-unit = s:option(ListValue, "force_unit")
-unit.default = "hours"
-unit:value("minutes", "min")
-unit:value("hours", "h")
-
-
-return m
--
2.25.1