Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #565 from yousong/l2tp-server

Browse source 
Allow host:port value for l2tp `server` option
This commit is contained in:
Jo-Philipp Wich 2015-12-02 13:57:05 +01:00
commit e8465b3e4f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/luci-base/luasrc/view/cbi/value.htm
View file

@ -29,7 +29,7 @@
<%- end -%>'); <%- end -%>');
<%- end %> <%- end %>
<% if self.datatype then -%> <% if self.datatype then -%>
cbi_validate_field('<%=cbid%>', <%=tostring((self.optional or self.rmempty) == true)%>, '<%=self.datatype:gsub("'", "\\'")%>'); cbi_validate_field('<%=cbid%>', <%=tostring((self.optional or self.rmempty) == true)%>, '<%=self.datatype:gsub("\\", "\\\\"):gsub("'", "\\'")%>');
<%- end %> <%- end %>
//]]></script> //]]></script>
<% end -%> <% end -%>

2
protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
View file

@ -8,7 +8,7 @@ local ipv6, defaultroute, metric, peerdns, dns, mtu
server = section:taboption("general", Value, "server", translate("L2TP Server")) server = section:taboption("general", Value, "server", translate("L2TP Server"))
server.datatype = "host" server.datatype = "or(host, hostport)"
username = section:taboption("general", Value, "username", translate("PAP/CHAP username")) username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))