From: Steven Barth Date: Sun, 7 Sep 2008 21:22:39 +0000 (+0000) Subject: libs/cbi: Catch errors while creating named sections X-Git-Tag: 0.9.0~1384 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8282d382bc675eb1c930eed0fe65c41050400b8;p=oweals%2Fluci.git libs/cbi: Catch errors while creating named sections --- diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua index a37e81e87..3e7209781 100644 --- a/libs/cbi/luasrc/cbi.lua +++ b/libs/cbi/luasrc/cbi.lua @@ -566,7 +566,7 @@ function AbstractSection.create(self, section) local stat if section then - stat = self.map:set(section, nil, self.sectiontype) + stat = section:match("^%w+$") and self.map:set(section, nil, self.sectiontype) else section = self.map:add(self.sectiontype) stat = section @@ -795,6 +795,9 @@ function TypedSection.parse(self, novld) if name and #name > 0 then created = self:create(name) and name + if not created then + self.invalid_cts = true + end end end end diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm index 49930f848..be7e723f7 100644 --- a/libs/cbi/luasrc/view/cbi/tblsection.htm +++ b/libs/cbi/luasrc/view/cbi/tblsection.htm @@ -113,8 +113,12 @@ end <% if self.anonymous then %> <% else %> + <% if self.invalid_cts then -%>
<% end %> + <% if self.invalid_cts then -%> +
<%:cbi_invalid%>
+ <%- end %> <% end %> diff --git a/libs/cbi/luasrc/view/cbi/tsection.htm b/libs/cbi/luasrc/view/cbi/tsection.htm index 33d5c8e49..70c44aaf6 100644 --- a/libs/cbi/luasrc/view/cbi/tsection.htm +++ b/libs/cbi/luasrc/view/cbi/tsection.htm @@ -45,8 +45,12 @@ $Id$ <% if self.anonymous then -%> <%- else -%> + <% if self.invalid_cts then -%>
<% end %> + <% if self.invalid_cts then -%> +
<%:cbi_invalid%>
+ <%- end %> <%- end %> <%- end %> diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua index fce84fe3f..dab4bb873 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua @@ -33,6 +33,8 @@ end function s.create(self, section) if TypedSection.create(self, section) then created = section + else + self.invalid_cts = true end end