From bd93652bba291b8c6a5d6f0753aea1a5241f9f6a Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 15 Jan 2009 21:44:39 +0000 Subject: Modified html.lua and viewlibrary.lua and all html files to html_escape variables before displaying them. git-svn-id: svn://svn.alpinelinux.org/acf/opennhrp/trunk@1678 ab2d0c66-481e-0410-8bed-d214d4d58bed --- opennhrp-editinterface-html.lsp | 2 +- opennhrp-listinterfaces-html.lsp | 8 ++++---- opennhrp-show-html.lsp | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/opennhrp-editinterface-html.lsp b/opennhrp-editinterface-html.lsp index 6fa2bec..a9c4d65 100644 --- a/opennhrp-editinterface-html.lsp +++ b/opennhrp-editinterface-html.lsp @@ -17,7 +17,7 @@ require("viewfunctions") }); -

<%= form.label %>

+

<%= html.html_escape(form.label) %>

<% form.value.interface.readonly = true local option = {"interface", "type", "map"} diff --git a/opennhrp-listinterfaces-html.lsp b/opennhrp-listinterfaces-html.lsp index ca3fdb6..7f9181c 100644 --- a/opennhrp-listinterfaces-html.lsp +++ b/opennhrp-listinterfaces-html.lsp @@ -4,7 +4,7 @@ require("viewfunctions") <% displaycommandresults({"editinterface"}, session) %> -

<%= view.label %>

+

<%= html.html_escape(view.label) %>

@@ -17,9 +17,9 @@ require("viewfunctions") - - - + + + <% end %>
Action <% io.write(html.link{value = "editinterface?interface="..intf.interface.."&redir="..page_info.orig_action, label="Edit " }) %> <%= intf.interface %><%= intf.type %>

<%= string.gsub(intf.errtxt or "", "\n", "
") %>

<%= html.html_escape(intf.interface) %><%= html.html_escape(intf.type) %>

<%= string.gsub(html.html_escape(intf.errtxt), "\n", "
") %>
diff --git a/opennhrp-show-html.lsp b/opennhrp-show-html.lsp index 79847c4..9b5ac46 100644 --- a/opennhrp-show-html.lsp +++ b/opennhrp-show-html.lsp @@ -6,12 +6,12 @@ require("viewfunctions") viewlibrary.dispatch_component("status") end %> -

<%= data.label %>

+

<%= html.html_escape(data.label) %>

<% displayitem(data.value.status) %> -
<%= data.value.peers_list.label %>
+
<%= html.html_escape(data.value.peers_list.label) %>
<% local found @@ -19,7 +19,7 @@ displayitem(data.value.status) found = true %> - + <% for i,entries in ipairs(addresses) do io.write("\n") + io.write(".png' width='16' height='16' title='" .. html.html_escape(entries.Type.descr) .. "'> " .. html.html_escape(entries["Protocol-Address"].value) .. "\n") for j,entry in pairs(entries) do if j ~= "Protocol-Address" then - io.write("\n") end -- cgit v1.2.3
<%= intf %>
<%= html.html_escape(intf) %>
" .. entries["Protocol-Address"].value .. "
"..entry.label..""..entry.value) + io.write("
"..html.html_escape(entry.label)..""..html.html_escape(entry.value)) if entry.descr then - io.write(" (" .. entry.descr .. ")") + io.write(" (" .. html.html_escape(entry.descr) .. ")") end io.write("