luci-app-ddns: Update to support ddns-scripts 2.1.0-1

fix verify of entry for DNS server Issue #244
	https://github.com/openwrt/luci/issues/244
add support for option 'update_script'
add display of version information when click on "Dynamic DNS" on
overview page
add verify of installed ddns-scripts version and show as hint if not
correct version
modified epoch to date conversation
cbi object Flag did not set section.changed state, fixed in
tools.flag_parse function
ucitrack entry no longer needed and removed
minor fixes

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

1 files changed, 112 insertions, 29 deletions

diff --git a/applications/luci-ddns/luasrc/tools/ddns.lua b/applications/luci-ddns/luasrc/tools/ddns.lua
index 4172d84ae..8d56c92a1 100644
--- a/applications/luci-ddns/luasrc/tools/ddns.lua
+++ b/applications/luci-ddns/luasrc/tools/ddns.lua
@@ -1,7 +1,7 @@
 --[[
 LuCI - Lua Configuration Interface
 
-shared module for luci-app-ddns-v2
+shared module for luci-app-ddns
 Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
 
 function parse_url copied from https://svn.nmap.org/nmap/nselib/url.lua
@@ -18,67 +18,128 @@ You may obtain a copy of the License at
 
 module("luci.tools.ddns", package.seeall)
 
-require "luci.sys"
-require "nixio.fs"
+local NX   = require "nixio"
+local NXFS = require "nixio.fs"
+local OPKG = require "luci.model.ipkg"
+local UCI  = require "luci.model.uci"
+local SYS  = require "luci.sys"
+local UTIL = require "luci.util"
 
+-- function to calculate seconds from given interval and unit
+function calc_seconds(interval, unit)
+	if not tonumber(interval) then
+		return nil
+	elseif unit == "days" then
+		return (tonumber(interval) * 86400)	-- 60 sec * 60 min * 24 h
+	elseif unit == "hours" then
+		return (tonumber(interval) * 3600)	-- 60 sec * 60 min
+	elseif unit == "minutes" then
+		return (tonumber(interval) * 60)	-- 60 sec
+	elseif unit == "seconds" then
+		return tonumber(interval)
+	else
+		return nil
+	end
+end
+
+-- check if IPv6 supported by OpenWrt
 function check_ipv6()
-	return nixio.fs.access("/proc/net/ipv6_route") 
-	   and nixio.fs.access("/usr/sbin/ip6tables")
+	return NXFS.access("/proc/net/ipv6_route") 
+	   and NXFS.access("/usr/sbin/ip6tables")
 end
 
+-- check if Wget with SSL support or cURL installed
 function check_ssl()
-	if (luci.sys.call([[ grep -iq "\+ssl" /usr/bin/wget 2>/dev/null ]]) == 0) then
+	if (SYS.call([[ grep -iq "\+ssl" /usr/bin/wget 2>/dev/null ]]) == 0) then
 		return true
 	else
-		return nixio.fs.access("/usr/bin/curl")
+		return NXFS.access("/usr/bin/curl")
 	end
 end
 
+-- check if Wget with SSL or cURL with proxy support installed
 function check_proxy()
 	-- we prefere GNU Wget for communication
-	if (luci.sys.call([[ grep -iq "\+ssl" /usr/bin/wget 2>/dev/null ]]) == 0) then
+	if (SYS.call([[ grep -iq "\+ssl" /usr/bin/wget 2>/dev/null ]]) == 0) then
 		return true
 
 	-- if not installed cURL must support proxy
-	elseif nixio.fs.access("/usr/bin/curl") then
-		return (luci.sys.call([[ grep -iq all_proxy /usr/lib/libcurl.so* 2>/dev/null ]]) == 0)
+	elseif NXFS.access("/usr/bin/curl") then
+		return (SYS.call([[ grep -iq all_proxy /usr/lib/libcurl.so* 2>/dev/null ]]) == 0)
 
 	-- only BusyBox Wget is installed
 	else
-		return nixio.fs.access("/usr/bin/wget")
+		return NXFS.access("/usr/bin/wget")
 	end
 end
 
+-- check if BIND host installed
 function check_bind_host()
-	return nixio.fs.access("/usr/bin/host")
+	return NXFS.access("/usr/bin/host")
 end
 
--- function to calculate seconds from given interval and unit
-function calc_seconds(interval, unit)
-	if not tonumber(interval) then
-		return nil
-	elseif unit == "days" then
-		return (tonumber(interval) * 86400)	-- 60 sec * 60 min * 24 h
-	elseif unit == "hours" then
-		return (tonumber(interval) * 3600)	-- 60 sec * 60 min
-	elseif unit == "minutes" then
-		return (tonumber(interval) * 60)	-- 60 sec
-	elseif unit == "seconds" then
-		return tonumber(interval)
-	else
-		return nil
+-- convert epoch date to given format
+function epoch2date(epoch, format)
+	if not format or #format < 2 then
+		local uci = UCI.cursor()
+		format    = uci:get("ddns", "global", "date_format") or "%F %R"
+		uci:unload("ddns")
 	end
+	format = format:gsub("%%n", "<br />")	-- replace newline
+	format = format:gsub("%%t", "    ")	-- replace tab
+	return os.date(format, epoch)
+end
+
+-- read lastupdate from [section].update file
+function get_lastupd(section)
+	local uci     = UCI.cursor()
+	local run_dir = uci:get("ddns", "global", "run_dir") or "/var/run/ddns"
+	local etime   = tonumber(NXFS.readfile("%s/%s.update" % { run_dir, section } ) or 0 )
+	uci:unload("ddns")
+	return etime
 end
 
 -- read PID from run file and verify if still running
-function get_pid(section, run_dir)
-	local pid = tonumber(nixio.fs.readfile("%s/%s.pid" % { run_dir, section } ) or 0 )
-	if pid > 0 and not luci.sys.process.signal(pid, 0) then
+function get_pid(section)
+	local uci     = UCI.cursor()
+	local run_dir = uci:get("ddns", "global", "run_dir") or "/var/run/ddns"
+	local pid     = tonumber(NXFS.readfile("%s/%s.pid" % { run_dir, section } ) or 0 )
+	if pid > 0 and not NX.kill(pid, 0) then
 		pid = 0
 	end
+	uci:unload("ddns")
 	return pid
 end
 
+-- read version information for given package if installed
+function ipkg_version(package)
+	if not package then 
+		return nil
+	end
+	local info = OPKG.info(package)
+	local data = {}
+	local version = ""
+	local i = 0
+	for k, v in pairs(info) do
+		if v.Package == package and v.Status.installed then		
+			version = v.Version
+			i = i + 1
+		end
+	end
+	if i > 1 then	-- more then one valid record
+		return data
+	end
+	local sver = UTIL.split(version, "[%.%-]", nil, true)
+	data = {
+		version = version,
+		major   = tonumber(sver[1]) or 0,
+		minor   = tonumber(sver[2]) or 0,
+		patch   = tonumber(sver[3]) or 0,
+		build   = tonumber(sver[4]) or 0
+	}
+	return data
+end
+
 -- replacement of build-in read of UCI option
 -- modified AbstractValue.cfgvalue(self, section) from cbi.lua
 -- needed to read from other option then current value definition
@@ -103,6 +164,28 @@ function read_value(self, section, option)
 	end
 end
 
+-- replacement of build-in Flag.parse of cbi.lua
+-- modified to mark section as changed if value changes
+-- current parse did not do this, but it is done AbstaractValue.parse()
+function flag_parse(self, section)
+	local fexists = self.map:formvalue(
+		luci.cbi.FEXIST_PREFIX .. self.config .. "." .. section .. "." .. self.option)
+
+	if fexists then
+		local fvalue = self:formvalue(section) and self.enabled or self.disabled
+		local cvalue = self:cfgvalue(section)
+		if fvalue ~= self.default or (not self.optional and not self.rmempty) then
+			self:write(section, fvalue)
+		else
+			self:remove(section)
+		end
+		if (fvalue ~= cvalue) then self.section.changed = true end
+	else
+		self:remove(section)
+		self.section.changed = true 
+	end
+end
+
 -----------------------------------------------------------------------------
 -- copied from https://svn.nmap.org/nmap/nselib/url.lua
 -- @author Diego Nehab