libs/web: fix html output for complex datatypes containing apostrophes

[project/luci.git] / libs / web / luasrc / view / cbi / value.htm

diff --git a/libs/web/luasrc/view/cbi/value.htm b/libs/web/luasrc/view/cbi/value.htm
index a7b49de..19715a5 100644 (file)
--- a/libs/web/luasrc/view/cbi/value.htm
+++ b/libs/web/luasrc/view/cbi/value.htm
@@ -1,22 +1,11 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
--%>

 <%+cbi/valueheader%>
 <%+cbi/valueheader%>

-       <input type="<%=self.password and 'password" class="cbi-input-password' or 'text" class="cbi-input-text' %>" onchange="cbi_d_update(this.id)"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self:cfgvalue(section) or self.default) .. ifattr(self.size, "size")%> />
+       <input type="<%=self.password and 'password" class="cbi-input-password' or 'text" class="cbi-input-text' %>" onchange="cbi_d_update(this.id)"<%=
+               attr("name", cbid) .. attr("id", cbid) .. attr("value", self:cfgvalue(section) or self.default) ..
+               ifattr(self.size, "size") .. ifattr(self.placeholder, "placeholder")
+       %> />

        <% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %>
        <% if #self.keylist > 0 or self.datatype then -%>
        <% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %>
        <% if #self.keylist > 0 or self.datatype then -%>

-       <script type="text/javascript">
+       <script type="text/javascript">//<![CDATA[

                <% if #self.keylist > 0 then -%>
                cbi_combobox_init('<%=cbid%>', {
                <%-
                <% if #self.keylist > 0 then -%>
                cbi_combobox_init('<%=cbid%>', {
                <%-


@@ -37,8 +26,8 @@ $Id$
                <%- end -%>');
                <%- end %>
                <% if self.datatype then -%>
                <%- end -%>');
                <%- end %>
                <% if self.datatype then -%>

-               cbi_validate_field('<%=cbid%>', <%=tostring(self.optional == true)%>, '<%=self.datatype%>');
+               cbi_validate_field('<%=cbid%>', <%=tostring((self.optional or self.rmempty) == true)%>, '<%=self.datatype:gsub("'", "\\'")%>');

                <%- end %>
                <%- end %>

-       </script>
+       //]]></script>

        <% end -%>
 <%+cbi/valuefooter%>
        <% end -%>
 <%+cbi/valuefooter%>