* luci/modules/admin-full: only display interface protocols that are actually supported

* luci/18n: add prereq description for interface proto to translations

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index ffd15a4fce8c2c87bd3a26e5cbb632b92492550f..b43863812a6ae51a23696c767be37983bd58c58d 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -195,6 +195,7 @@ dhcp_timeremain = 'Leasetime remaining'
 dhcp_leases_active = 'Active Leases'
 a_n_ptp = 'Point-to-Point Connections'
 a_n_ptp1 = 'Point-to-Point connections with <abbr title="Point-to-Point Protocol over Ethernet">PPPoE</abbr> or <abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr> are often used to connect a device over <abbr title="Digital Subscriber Line">DSL</abbr> or similar technologies to an internet access point.'
+network_interface_prereq = 'You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support'
 network_interface_server = '<abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr>-Server'
 network_interface_demand = 'Automatic Disconnect'
 network_interface_demand_desc = 'Time (in seconds) after which an unused connection will be closed'

diff --git a/i18n/english/luasrc/i18n/admin-core.en.xml b/i18n/english/luasrc/i18n/admin-core.en.xml
index 266f36258561e9c8b2cab9621ad3b4e695ea6041..05fd023a6b5e0b411abb24cfbd5084b40e361e3e 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.xml
+++ b/i18n/english/luasrc/i18n/admin-core.en.xml
@@ -199,6 +199,7 @@
 <i18n:msg xml:id="dhcp_leases_active">Active Leases</i18n:msg>
 <i18n:msg xml:id="a_n_ptp">Point-to-Point Connections</i18n:msg>
 <i18n:msg xml:id="a_n_ptp1">Point-to-Point connections with <abbr title="Point-to-Point Protocol over Ethernet">PPPoE</abbr> or <abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr> are often used to connect a device over <abbr title="Digital Subscriber Line">DSL</abbr> or similar technologies to an internet access point.</i18n:msg>
+<i18n:msg xml:id="network_interface_prereq">You need to install "comgt" for UMTS/GPRS, "ppp-mod-pppoe" for PPPoE, "ppp-mod-pppoa" for PPPoA or "pptp" for PPtP support</i18n:msg>
 <i18n:msg xml:id="network_interface_server"><abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr>-Server</i18n:msg>
 <i18n:msg xml:id="network_interface_demand">Automatic Disconnect</i18n:msg>
 <i18n:msg xml:id="network_interface_demand_desc">Time (in seconds) after which an unused connection will be closed</i18n:msg>

diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index 650cc06c0435a276ce334a810a86a4c1fcd4a815..cdee5f4499eae7b1396734b4309d38b0660d3735 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -198,6 +198,7 @@ dhcp_leases = 'Zuweisungen'
 luci_ethers = 'Statische Einträge'
 dhcp_timeremain = 'Verbleibende Gültigkeit'
 dhcp_leases_active = 'Aktive Zuweisungen'
+network_interface_prereq = 'Für die Unterstützung von UMTS/GPRS muss "comgt", für PPPoE "ppp-mod-pppoe", für PPPoA "ppp-mod-pppoa" und für PPtP "pptp" installiert sein'
 network_interface_demand = 'Automatische Trennung'
 network_interface_demand_desc = 'Zeit (in s) nach der die Verbindung bei Inaktivität getrennt wird'
 network_interface_keepalive = 'Keep-Alive'

diff --git a/i18n/german/luasrc/i18n/admin-core.de.xml b/i18n/german/luasrc/i18n/admin-core.de.xml
index cab785265e55b3d0ef3f4004146334ff44bc838e..c2d71380baa9b6a583885ad3513e4c818aaaa65e 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.xml
+++ b/i18n/german/luasrc/i18n/admin-core.de.xml
@@ -205,6 +205,7 @@
 <i18n:msg xml:id="dhcp_timeremain">Verbleibende Gültigkeit</i18n:msg>
 <i18n:msg xml:id="dhcp_leases_active">Aktive Zuweisungen</i18n:msg>
 
+<i18n:msg xml:id="network_interface_prereq">Für die Unterstützung von UMTS/GPRS muss "comgt", für PPPoE "ppp-mod-pppoe", für PPPoA "ppp-mod-pppoa" und für PPtP "pptp" installiert sein</i18n:msg>
 <i18n:msg xml:id="network_interface_demand">Automatische Trennung</i18n:msg>
 <i18n:msg xml:id="network_interface_demand_desc">Zeit (in s) nach der die Verbindung bei Inaktivität getrennt wird</i18n:msg>
 <i18n:msg xml:id="network_interface_keepalive">Keep-Alive</i18n:msg>

diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
index fe5e059c99e55c2085ad8713cfceb0829a3caefc..600741b7e9b178fe0945c928536882cac6dd680b 100644 (file)
--- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
+++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
@@ -195,6 +195,7 @@ dhcp_timeremain = 'Tempo de lease restante'
 dhcp_leases_active = 'Leases Ativos'
 a_n_ptp = 'Conexões Ponto-a-Ponto'
 a_n_ptp1 = 'Conexões Ponto-a-Ponto com <abbr title="Protocolo Ponto-a-Ponto sobre Ethernet">PPPoE</abbr> ou <abbr title="Protocolo de Tunelamento Ponto-a-Ponto">PPTP</abbr> muitas vezes são usados para conectar um dispositivo sobre <abbr title="Linha Digital de Assinante">DSL</abbr> ou tecnologia similar para um ponto de acesso à internet.'
+network_interface_prereq = 'You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support'
 network_interface_server = 'Servidor-<abbr title="Protocolo de Tunelamento Ponto-a-Ponto">PPTP</abbr>'
 network_interface_demand = 'Desconexão Automática'
 network_interface_demand_desc = 'Tempo (em segundos) para desconexão de uma conexão não mais utilizada'

diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
index 8c726aab5b1a2a4b6901411a605a8ff3071769b0..e9c74c787066f5f6f9cd26e9b9e702a0876b016d 100644 (file)
--- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
+++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
@@ -166,9 +166,9 @@
 <i18n:msg xml:id="dhcp_dnsmasq_dhcpleasemax"><abbr title="máximo">max.</abbr> de <abbr title="Protocolo de Configuração Dinâmica de Hosts">DHCP</abbr>-Leases</i18n:msg>
 <i18n:msg xml:id="dhcp_dnsmasq_addnhosts">arquivo host adicional</i18n:msg>
 <i18n:msg xml:id="dhcp_dnsmasq_queryport">porta para consulta</i18n:msg>
-<i18n:msg xml:id="dhcp_dnsmasq_enabletftp">Ativar servidor TFTP</i18n:msg> 
-<i18n:msg xml:id="dhcp_dnsmasq_tftproot">Diretório raiz do servidor TFTP</i18n:msg> 
-<i18n:msg xml:id="dhcp_dnsmasq_dhcpboot">Imagem para o boot remoto</i18n:msg> 
+<i18n:msg xml:id="dhcp_dnsmasq_enabletftp">Ativar servidor TFTP</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_tftproot">Diretório raiz do servidor TFTP</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_dhcpboot">Imagem para o boot remoto</i18n:msg>
 <i18n:msg xml:id="a_n_switch">Switch</i18n:msg>
 <i18n:msg xml:id="a_n_conntrack">Conexões Ativas</i18n:msg>
 <i18n:msg xml:id="a_n_conntrack_desc">Esta página fornece informações sobre as conexões de rede ativas.</i18n:msg>
@@ -199,6 +199,7 @@
 <i18n:msg xml:id="dhcp_leases_active">Leases Ativos</i18n:msg>
 <i18n:msg xml:id="a_n_ptp">Conexões Ponto-a-Ponto</i18n:msg>
 <i18n:msg xml:id="a_n_ptp1">Conexões Ponto-a-Ponto com <abbr title="Protocolo Ponto-a-Ponto sobre Ethernet">PPPoE</abbr> ou <abbr title="Protocolo de Tunelamento Ponto-a-Ponto">PPTP</abbr> muitas vezes são usados para conectar um dispositivo sobre <abbr title="Linha Digital de Assinante">DSL</abbr> ou tecnologia similar para um ponto de acesso à internet.</i18n:msg>
+<i18n:msg xml:id="network_interface_prereq">You need to install "comgt" for UMTS/GPRS, "ppp-mod-pppoe" for PPPoE, "ppp-mod-pppoa" for PPPoA or "pptp" for PPtP support</i18n:msg>
 <i18n:msg xml:id="network_interface_server">Servidor-<abbr title="Protocolo de Tunelamento Ponto-a-Ponto">PPTP</abbr></i18n:msg>
 <i18n:msg xml:id="network_interface_demand">Desconexão Automática</i18n:msg>
 <i18n:msg xml:id="network_interface_demand_desc">Tempo (em segundos) para desconexão de uma conexão não mais utilizada</i18n:msg>

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 780e6075b0e0b1915ba5f973e3e66c7c7eecb607..98623e730c54492bafb63225caeaaf718ee42721 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -12,8 +12,16 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 require("luci.tools.webadmin")
 arg[1] = arg[1] or ""
+
+local has_3g    = luci.fs.mtime("/usr/bin/gcom")
+local has_pptp  = luci.fs.mtime("/usr/sbin/pptp")
+local has_pppd  = luci.fs.mtime("/usr/sbin/pppd")
+local has_pppoe = luci.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")
+local has_pppoa = luci.fs.glob("/usr/lib/pppd/*/pppoatm.so")
+
 m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
 
 s = m:section(NamedSection, arg[1], "interface")
@@ -24,13 +32,19 @@ back.value = ""
 back.titleref = luci.dispatcher.build_url("admin", "network", "network")
 
 p = s:option(ListValue, "proto", translate("protocol"))
+p.override_scheme = true
+p.default = "static"
 p:value("static", translate("static"))
 p:value("dhcp", "DHCP")
-p:value("pppoe", "PPPoE")
-p:value("ppp", "PPP")
-p:value("3g", "UMTS/3G")
-p:value("pptp", "PPTP")
-p.default = "static"
+if has_pppd  then p:value("ppp",   "PPP")     end
+if has_pppoe then p:value("pppoe", "PPPoE")   end
+if has_pppoa then p:value("pppoa", "PPPoA")   end
+if has_3g    then p:value("3g",    "UMTS/3G") end
+if has_pptp  then p:value("pptp",  "PPTP")    end
+
+if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then
+       p.description = translate("network_interface_prereq")
+end
 
 br = s:option(Flag, "type", translate("a_n_i_bridge"), translate("a_n_i_bridge1"))
 br.enabled = "bridge"