From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 19 Jun 2016 16:56:15 +0000 (+0300)
Subject: Merge pull request #744 from chris5560/master
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=65c7610b0597592efda295706dbef3b53d0e7085;hp=cd50f27956f5c30c13b52e8a70178ce07972d552;p=project%2Fluci.git

Merge pull request #744 from chris5560/master

luci-app-ddns: fix handling of parameter "is_glue" and "dns_seerver"
---

diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile
index 7a09af07f..c660086f7 100644
--- a/applications/luci-app-ddns/Makefile
+++ b/applications/luci-app-ddns/Makefile
@@ -10,7 +10,7 @@ PKG_NAME:=luci-app-ddns
 
 # Version == major.minor.patch
 # increase on new functionality (minor) or patches (patch)
-PKG_VERSION:=2.4.5
+PKG_VERSION:=2.4.6
 
 # Release == build
 # increase on changes of translation files
diff --git a/applications/luci-app-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua
index d6ccf9cd4..1f2e6f2b9 100755
--- a/applications/luci-app-ddns/luasrc/controller/ddns.lua
+++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua
@@ -18,11 +18,11 @@ local UTIL = require "luci.util"
 local DDNS = require "luci.tools.ddns"		-- ddns multiused functions
 
 local srv_name    = "ddns-scripts"
-local srv_ver_min = "2.7.1"			-- minimum version of service required
+local srv_ver_min = "2.7.2"			-- minimum version of service required
 local srv_ver_cmd = [[/usr/lib/ddns/dynamic_dns_updater.sh --version | awk {'print $2'}]]
 local app_name    = "luci-app-ddns"
 local app_title   = "Dynamic DNS"
-local app_version = "2.4.4-1"
+local app_version = "2.4.6-1"
 
 function index()
 	local nxfs	= require "nixio.fs"		-- global definitions not available
@@ -193,8 +193,8 @@ local function _get_status()
 		local is_glue = tonumber(s["is_glue"] or 0)
 		local command = [[/usr/lib/ddns/dynamic_dns_lucihelper.sh]]
 		command = command .. [[ get_registered_ip ]] .. lookup_host .. [[ ]] .. use_ipv6 ..
-			[[ ]] .. force_ipversion .. [[ ]] .. force_dnstcp .. [[ ]] .. dnsserver ..
-			[[ ]] .. is_glue
+			[[ ]] .. force_ipversion .. [[ ]] .. force_dnstcp ..
+			[[ ]] .. is_glue .. [[ ]] .. dnsserver
 		local reg_ip = SYS.exec(command)
 		if reg_ip == "" then
 			reg_ip = "_nodata_"
diff --git a/applications/luci-app-ddns/po/de/ddns.po b/applications/luci-app-ddns/po/de/ddns.po
index 2399380ec..517fe3634 100644
--- a/applications/luci-app-ddns/po/de/ddns.po
+++ b/applications/luci-app-ddns/po/de/ddns.po
@@ -439,7 +439,7 @@ msgstr ""
 "Aktualisierungen über HTTPS Protokoll zu unterstützen."
 
 msgid "Network"
-msgstr ""
+msgstr "Netzwerk"
 
 msgid "Network on which the ddns-updater scripts will be started"
 msgstr "Netzwerk auf dem Ereignisse die ddns-updater Skripte starten"