Merge r4121

diff --git a/applications/luci-upnp/luasrc/i18n/upnp.de.lua b/applications/luci-upnp/luasrc/i18n/upnp.de.lua
index b2757b0d7de850bacaeef7202968977e6197a1a8..777ae876edf3d4e54c2dc4b35dbab38d0ce9b712 100644 (file)
--- a/applications/luci-upnp/luasrc/i18n/upnp.de.lua
+++ b/applications/luci-upnp/luasrc/i18n/upnp.de.lua
@@ -1,6 +1,7 @@
 upnpd = 'Universal Plug & Play'
 upnpd_desc = 'UPNP ermöglicht die automatische Konfiguration des Routers durch Clients im lokalen Netzwerk.'
 upnpd_config_desc = 'UPNP sollte nur wenn unbedingt nötig aktiviert werden, da es ein Sicherheitsrisiko für das Netzwerk darstellen kann.'
+upnpd_config_securemode = 'Sicheren Modus aktivieren'
 upnpd_config_logoutput = 'Ausgabe protokollieren'
 upnpd_config_download = 'Downlink'
 upnpd_config_upload = 'Uplink'

diff --git a/applications/luci-upnp/luasrc/i18n/upnp.de.xml b/applications/luci-upnp/luasrc/i18n/upnp.de.xml
index b6aa78b7cc3fc39a4976d871a5e3270836474528..2a21b7b7987e69616a9e68e2107bc69f0b948c9e 100644 (file)
--- a/applications/luci-upnp/luasrc/i18n/upnp.de.xml
+++ b/applications/luci-upnp/luasrc/i18n/upnp.de.xml
@@ -5,6 +5,7 @@
 <i18n:msg xml:id="upnpd">Universal Plug &amp; Play</i18n:msg>
 <i18n:msg xml:id="upnpd_desc">UPNP ermöglicht die automatische Konfiguration des Routers durch Clients im lokalen Netzwerk.</i18n:msg>
 <i18n:msg xml:id="upnpd_config_desc">UPNP sollte nur wenn unbedingt nötig aktiviert werden, da es ein Sicherheitsrisiko für das Netzwerk darstellen kann.</i18n:msg>
+<i18n:msg xml:id="upnpd_config_securemode">Sicheren Modus aktivieren</i18n:msg>
 <i18n:msg xml:id="upnpd_config_logoutput">Ausgabe protokollieren</i18n:msg>
 <i18n:msg xml:id="upnpd_config_download">Downlink</i18n:msg>
 <i18n:msg xml:id="upnpd_config_upload">Uplink</i18n:msg>

diff --git a/applications/luci-upnp/luasrc/i18n/upnp.en.lua b/applications/luci-upnp/luasrc/i18n/upnp.en.lua
index fc0293987dd37ab8870801730b4df0beedaecbcb..8e6c825e6eb240f6bd233d825fd22821cdb308be 100644 (file)
--- a/applications/luci-upnp/luasrc/i18n/upnp.en.lua
+++ b/applications/luci-upnp/luasrc/i18n/upnp.en.lua
@@ -1,6 +1,7 @@
 upnpd = 'Universal Plug & Play'
 upnpd_desc = 'UPNP allows clients in the local network to automatically configure the router.'
 upnpd_config_desc = 'UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.'
+upnpd_config_securemode = 'Enable secure mode'
 upnpd_config_logoutput = 'Log output'
 upnpd_config_download = 'Downlink'
 upnpd_config_upload = 'Uplink'

diff --git a/applications/luci-upnp/luasrc/i18n/upnp.en.xml b/applications/luci-upnp/luasrc/i18n/upnp.en.xml
index 1d2b1e3f0009edcc282080a93aee98ddb0464ff3..60d6225112412b356841a3000cd94a027b244d64 100644 (file)
--- a/applications/luci-upnp/luasrc/i18n/upnp.en.xml
+++ b/applications/luci-upnp/luasrc/i18n/upnp.en.xml
@@ -5,6 +5,7 @@
 <i18n:msg xml:id="upnpd">Universal Plug &amp; Play</i18n:msg>
 <i18n:msg xml:id="upnpd_desc">UPNP allows clients in the local network to automatically configure the router.</i18n:msg>
 <i18n:msg xml:id="upnpd_config_desc">UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.</i18n:msg>
+<i18n:msg xml:id="upnpd_config_securemode">Enable secure mode</i18n:msg>
 <i18n:msg xml:id="upnpd_config_logoutput">Log output</i18n:msg>
 <i18n:msg xml:id="upnpd_config_download">Downlink</i18n:msg>
 <i18n:msg xml:id="upnpd_config_upload">Uplink</i18n:msg>

diff --git a/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua b/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua
index 9170a311ded041fc35c215941376f0145afa43d2..cf2c3dbd7e018bd6a3f5e97d719f490862aa44c5 100644 (file)
--- a/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua
+++ b/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua
@@ -1,6 +1,7 @@
 upnpd = 'Plug & Play Universal'
 upnpd_desc = 'UPNP permite os clientes da rede local automaticamente configurar o roteador.'
 upnpd_config_desc = 'O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele pode resultar em elevados riscos de segurança para sua rede.'
+upnpd_config_securemode = 'Enable secure mode'
 upnpd_config_logoutput = 'Log de saída'
 upnpd_config_download = 'Link para download'
 upnpd_config_upload = 'Link para Upload'

diff --git a/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml b/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml
index 9b5788364ff2be911dc3499ff98bea530b828f7f..c239d907b82e6d69eefbeaf97e37cb46ede48692 100644 (file)
--- a/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml
+++ b/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml
@@ -5,6 +5,7 @@
 <i18n:msg xml:id="upnpd">Plug &amp; Play Universal</i18n:msg>
 <i18n:msg xml:id="upnpd_desc">UPNP permite os clientes da rede local automaticamente configurar o roteador.</i18n:msg>
 <i18n:msg xml:id="upnpd_config_desc">O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele pode resultar em elevados riscos de segurança para sua rede.</i18n:msg>
+<i18n:msg xml:id="upnpd_config_securemode">Enable secure mode</i18n:msg>
 <i18n:msg xml:id="upnpd_config_logoutput">Log de saída</i18n:msg>
 <i18n:msg xml:id="upnpd_config_download">Link para download</i18n:msg>
 <i18n:msg xml:id="upnpd_config_upload">Link para Upload</i18n:msg>

diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
index 79a38f7c53a09dd011fa16eb886ce76b21aacab6..0d07a564ad5e88cd1981844773171c5d705b19e4 100644 (file)
--- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
+++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
@@ -25,8 +25,9 @@ function e.cfgvalue(self, section)
        return (os.execute("/etc/init.d/miniupnpd enabled") == 0) and "1" or "0"
 end
 
+s:option(Flag, "secure_mode").rmempty = true
 s:option(Flag, "log_output").rmempty = true
 s:option(Value, "download").rmempty = true
 s:option(Value, "upload").rmempty = true
 
-return m
\ No newline at end of file
+return m