summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-08-15 18:26:32 +0000
committerSteven Barth <steven@midlink.org>2008-08-15 18:26:32 +0000
commit1d4196b3ff1bceaa858ffbee637bf212d5b5d428 (patch)
tree61e71efcc1f3d01ab0b108e5ab970d2765249ebd
parentd212e531d5b2b5933676b3ec3004c2be60980f97 (diff)
Some more escaping
-rw-r--r--libs/cbi/luasrc/view/cbi/dvalue.htm6
-rw-r--r--libs/cbi/luasrc/view/cbi/lvalue.htm2
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/cbi/luasrc/view/cbi/dvalue.htm b/libs/cbi/luasrc/view/cbi/dvalue.htm
index 7d22fe0d9d..bdcbd317ec 100644
--- a/libs/cbi/luasrc/view/cbi/dvalue.htm
+++ b/libs/cbi/luasrc/view/cbi/dvalue.htm
@@ -16,12 +16,12 @@ $Id$
<%+cbi/valueheader%>
<% if self.value then
if type(self.value) == "function" then %>
- <%=self:value(section)%>
+ <%=luci.util.pcdata(self:value(section))%>
<% else %>
- <%=self.value%>
+ <%=luci.util.pcdata(self.value)%>
<% end
else %>
- <%=self:cfgvalue(section)%>
+ <%=luci.util.pcdata(self:cfgvalue(section))%>
<% end %>
&nbsp;
<%+cbi/valuefooter%>
diff --git a/libs/cbi/luasrc/view/cbi/lvalue.htm b/libs/cbi/luasrc/view/cbi/lvalue.htm
index cb41f53d13..5108e85c48 100644
--- a/libs/cbi/luasrc/view/cbi/lvalue.htm
+++ b/libs/cbi/luasrc/view/cbi/lvalue.htm
@@ -16,7 +16,7 @@ $Id$
<% if self.widget == "select" then %>
<select onchange="cbi_d_update(this.id)"<%= attr("id", cbid) .. attr("name", cbid) .. ifattr(self.size, "size") %>>
<% for i, key in pairs(self.keylist) do -%>
- <option<%= attr("value", key) .. ifattr(self:cfgvalue(section) == key, "selected", "selected") %>><%=self.vallist[i]%></option>
+ <option<%= attr("value", key) .. ifattr(self:cfgvalue(section) == key, "selected", "selected") %>><%=luci.util.pcdata(self.vallist[i])%></option>
<%- end %>
</select>
<% elseif self.widget == "radio" then