* luci-0.8: merge translation fixes, theme changes, selective port handling and others

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / ifaces.lua

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 32de051..acecee0 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"
@@ -117,7 +131,6 @@ ip6gw:depends("proto", "static")
 ip6gw.optional = true
 
 dns = s:option(Value, "dns", translate("dnsserver"))
-dns:depends("proto", "static")
 dns.optional = true
 
 mtu = s:option(Value, "mtu", "MTU")
@@ -156,6 +169,7 @@ user:depends("proto", "3g")
 
 pass = s:option(Value, "password", translate("password"))
 pass.rmempty = true
+pass.password = true
 pass:depends("proto", "pptp")
 pass:depends("proto", "pppoe")
 pass:depends("proto", "ppp")
@@ -165,7 +179,7 @@ ka = s:option(Value, "keepalive",
  translate("network_interface_keepalive"),
  translate("network_interface_keepalive_desc")
 )
-ka.rmempty = true
+ka.optional = true
 ka:depends("proto", "pptp")
 ka:depends("proto", "pppoe")
 ka:depends("proto", "ppp")
@@ -175,7 +189,7 @@ demand = s:option(Value, "demand",
  translate("network_interface_demand"),
  translate("network_interface_demand_desc")
 )
-demand.rmempty = true
+demand.optional = true
 demand:depends("proto", "pptp")
 demand:depends("proto", "pppoe")
 demand:depends("proto", "ppp")