luci-app-olsr: handle empty result for non-status tables

[oweals/luci.git] / protocols / luci-proto-vpnc / luasrc / model / cbi / admin_network / proto_vpnc.lua

diff --git a/protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua b/protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua
index e450470eb3d1aa593112fc3941da1a519a26a670..3d85d02f40199b528b0eb065e24984568c0f5949 100644 (file)
--- a/protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua
+++ b/protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua
@@ -8,7 +8,7 @@ local authgroup, interface, passgroup, hexpassgroup
 local domain, vendor, natt_mode, dh_group
 local pfs, enable_single_des, enable_no_enc
 local mtu, local_addr, local_port, dpd_idle
-local auth_mode, target_network
+local auth_mode, target_network, defaultroute
 
 local ifc = net:get_interface():name()
 
@@ -26,21 +26,19 @@ port.datatype    = "port"
 ifname = section:taboption("general", Value, "interface", translate("Output Interface"))
 ifname.template = "cbi/network_netlist"
 
-mtu = section.taboption("general", Value, "mtu", translate("MTU"))
+mtu = section:taboption("general", Value, "mtu", translate("MTU"))
 mtu.datatype = "uinteger"
 
-section:taboption("general", Value, "authgroup", translate("AuthGroup"))
-
 username = section:taboption("general", Value, "username", translate("Username"))
 password = section:taboption("general", Value, "password", translate("Password"))
-hexpassword = section:taboption("general", Value, "hexpassword", translate("Obfuscated Password"))
 password.password = true
+hexpassword = section:taboption("general", Value, "hexpassword", translate("Obfuscated Password"))
 hexpassword.password = true
 authroup = section:taboption("general", Value, "authgroup", translate("Auth Group"))
 passgroup = section:taboption("general", Value, "passgroup", translate("Group Password"))
+passgroup.password = true
 hexpassgroup = section:taboption("general", Value, "hexpassgroup", translate("Obfuscated Group Password"))
-password.passgroup = true
-hexpassword.passgroup= true
+hexpassword.password= true
 
 domain = section:taboption("general", Value, "domain", translate("NT Domain"))
 vendor = section:taboption("general", Value, "vendor", translate("Vendor"))
@@ -50,17 +48,17 @@ dh_group:value("dh1")
 dh_group:value("dh5")
 
 pfs = section:taboption("general", ListValue, "pfs", translate("Perfect Forward Secrecy"))
-dh_group:value("server")
-dh_group:value("nopfs")
-dh_group:value("dh1")
-dh_group:value("dh2")
-dh_group:value("dh5")
+pfs:value("server")
+pfs:value("nopfs")
+pfs:value("dh1")
+pfs:value("dh2")
+pfs:value("dh5")
 
-natt_mode = section:taboption("general", ListValue, "natt_mode", translate("NAT-T Mode")
+natt_mode = section:taboption("general", ListValue, "natt_mode", translate("NAT-T Mode"))
 natt_mode:value("natt", translate("RFC3947 NAT-T mode"))
 natt_mode:value("none", translate("No NAT-T"))
-natt_mode:value("force-natt", translate("Force use of NAT-T")
-natt_mode:value("cisco-udp", translate("Cisco UDP encapsulation")
+natt_mode:value("force-natt", translate("Force use of NAT-T"))
+natt_mode:value("cisco-udp", translate("Cisco UDP encapsulation"))
 
 enable_no_enc = section:taboption("general", Flag, "enable_no_enc",
        translate("Disable Encryption"),
@@ -69,14 +67,19 @@ enable_no_enc.default = enable_no_enc.disabled
 
 enable_single_des = section:taboption("general", Flag, "enable_single_des",
        translate("Enable Single DES"),
-       translate("If checked, 1DES is enaled"))
+       translate("If checked, 1DES is enabled"))
 enable_no_enc.default = enable_single_des.disabled
 
-dpd_idle = section.taboption("general", Value, "dpd_idle", translate("DPD Idle Timeout"))
+dpd_idle = section:taboption("general", Value, "dpd_idle", translate("DPD Idle Timeout"))
 dpd_idle.datatype = "uinteger"
-dpd.placeholder = "600"
+dpd_idle.placeholder = "600"
 
 ifname = section:taboption("general", Value, "target_network", translate("Target network"))
 port.placeholder = "0.0.0.0/0"
 port.datatype    = "network"
 
+defaultroute = section:taboption("general", ListValue, "defaultroute",
+       translate("Default Route"),
+       translate("Set VPN as Default Route"))
+defaultroute:value("0", translate("No"))
+defaultroute:value("1", translate("Yes"))