diff options
8 files changed, 36 insertions, 36 deletions
diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm index b35bb71a2..abb6b90d8 100644 --- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm +++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm @@ -43,7 +43,7 @@ require("luci.http").prepare_content("text/html") <% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %> <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" /> <meta http-equiv="content-script-type" content="text/javascript" /> - <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> + <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> <!--[if lt IE 7]> <script type="text/javascript"> @@ -76,7 +76,7 @@ for k,v in pairs(request) do if c.nodes and c.nodes[v] then c = c.nodes[v] url = url .. "/" .. v - %><a href="<%=url%>"><%=pcdata(c.title or v)%></a> <% if k ~= #request then %>» <% end + %><a href="<%=url%>"><%=pcdata(striptags(c.title or v))%></a> <% if k ~= #request then %>» <% end end end %> @@ -110,7 +110,7 @@ local function submenu(prefix, node) href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> <li> - <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(nnode.title)%></a></span> + <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a></span> <%- submenu(prefix .. v.name .. "/", nnode) %> </li> <%- end %> @@ -133,7 +133,7 @@ if cattree and cattree.nodes then if not node.hidden and node.title and node.target then local href = controller.."/"..category.."/"..k.name href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> - <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=pcdata(node.title)%></a> + <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a> <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> </div> <% end @@ -145,7 +145,7 @@ end <ul><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> - <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(node.title)%></a></li> + <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(striptags(node.title))%></a></li> <% end end%> </ul> diff --git a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm index 88e35ca1d..a50b19ecc 100644 --- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm +++ b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm @@ -44,7 +44,7 @@ require("luci.http").prepare_content("text/html") <link rel="shortcut icon" href="<%=media%>/images/favicon.ico" /> <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" /> <meta http-equiv="content-script-type" content="text/javascript" /> - <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> + <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> <!--[if lt IE 7]> <script type="text/javascript"> @@ -92,7 +92,7 @@ for k,v in pairs(request) do if c.nodes and c.nodes[v] then c = c.nodes[v] url = url .. "/" .. v - %><a href="<%=url%>"><%=pcdata(c.title or v)%></a> <% if k ~= #request then %>» <% end + %><a href="<%=url%>"><%=pcdata(striptags(c.title or v))%></a> <% if k ~= #request then %>» <% end end end %> @@ -126,7 +126,7 @@ local function submenu(prefix, node) href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> <li> - <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a></span> + <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a></span> <%- submenu(prefix .. v.name .. "/", nnode) %> </li> <%- end %> @@ -149,7 +149,7 @@ if cattree and cattree.nodes then if not node.hidden and node.title and node.target then local href = controller.."/"..category.."/"..k.name href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> - <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=pcdata(node.title)%></a> + <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a> <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> </div> <% end @@ -161,7 +161,7 @@ end <ul><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> - <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(node.title)%></a></li> + <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(striptags(node.title))%></a></li> <% end end%> </ul> diff --git a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm index bdd17ac4a..2f1c000b4 100644 --- a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm +++ b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm @@ -49,7 +49,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <script type="text/javascript" src="<%=resource%>/VarType.js"></script> <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script> <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> @@ -96,7 +96,7 @@ local function submenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a><%- +<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a><%- submenu(prefix .. v.name .. "/", nnode) %></li> <%- @@ -122,7 +122,7 @@ if cattree and cattree.nodes then local href = controller.."/"..category.."/"..k.name.."/" href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> -<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=pcdata(node.title)%></a><% +<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=pcdata(href)%>"><%=pcdata(node.title)%></a><% submenu("/" .. category .. "/" .. k.name .. "/", node) %></li><% end end diff --git a/themes/freifunk/luasrc/view/themes/freifunk/header.htm b/themes/freifunk/luasrc/view/themes/freifunk/header.htm index f72df4938..30db92b01 100644 --- a/themes/freifunk/luasrc/view/themes/freifunk/header.htm +++ b/themes/freifunk/luasrc/view/themes/freifunk/header.htm @@ -44,7 +44,7 @@ require("luci.http").prepare_content("text/html") <link rel="shortcut icon" href="<%=media%>/images/favicon.ico" /> <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" /> <meta http-equiv="content-script-type" content="text/javascript" /> - <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> + <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> <!--[if lt IE 7]> <script type="text/javascript"> @@ -92,7 +92,7 @@ for k,v in pairs(request) do if c.nodes and c.nodes[v] then c = c.nodes[v] url = url .. "/" .. v - %><a href="<%=url%>"><%=pcdata(c.title or v)%></a> <% if k ~= #request then %>» <% end + %><a href="<%=url%>"><%=pcdata(striptags(c.title or v))%></a> <% if k ~= #request then %>» <% end end end %> @@ -126,7 +126,7 @@ local function submenu(prefix, node) href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> <li> - <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a></span> + <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a></span> <%- submenu(prefix .. v.name .. "/", nnode) %> </li> <%- end %> @@ -149,7 +149,7 @@ if cattree and cattree.nodes then if not node.hidden and node.title and node.target then local href = controller.."/"..category.."/"..k.name href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> - <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=pcdata(node.title)%></a> + <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a> <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> </div> <% end diff --git a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm index 5c1303bb2..cd2cf8733 100644 --- a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm +++ b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm @@ -1,4 +1,4 @@ -<%# +a<%# LuCI - Lua Configuration Interface Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> @@ -49,7 +49,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <script type="text/javascript" src="<%=resource%>/VarType.js"></script> <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script> <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> @@ -96,7 +96,7 @@ local function submenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a><%- +<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a><%- submenu(prefix .. v.name .. "/", nnode) %></li> <%- @@ -122,7 +122,7 @@ if cattree and cattree.nodes then local href = controller.."/"..category.."/"..k.name.."/" href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> -<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=pcdata(node.title)%></a><% +<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a><% submenu("/" .. category .. "/" .. k.name .. "/", node) %></li><% end end @@ -133,7 +133,7 @@ end <ul id="modemenu"><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> -<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(node.title)%></a></li><% +<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(striptags(node.title))%></a></li><% end end %> diff --git a/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm b/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm index 582db0106..5e4e05425 100644 --- a/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm +++ b/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm @@ -1,4 +1,4 @@ -<%# +a<%# LuCI - Lua Configuration Interface Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> @@ -51,7 +51,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <script type="text/javascript" src="<%=resource%>/VarType.js"></script> <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script> <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> @@ -98,7 +98,7 @@ local function submenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a><%- +<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a><%- submenu(prefix .. v.name .. "/", nnode) %></li> <%- @@ -124,7 +124,7 @@ if cattree and cattree.nodes then local href = controller.."/"..category.."/"..k.name.."/" href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> -<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=pcdata(node.title)%></a><% +<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a><% submenu("/" .. category .. "/" .. k.name .. "/", node) %></li><% end end @@ -135,7 +135,7 @@ end <ul id="modemenu"><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> -<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(node.title)%></a></li><% +<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(striptags(node.title))%></a></li><% end end %> diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm index 93ee32eb4..e523d2716 100644 --- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm +++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm @@ -1,4 +1,4 @@ -<%# +a<%# LuCI - Lua Configuration Interface Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> @@ -49,7 +49,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <script type="text/javascript" src="<%=resource%>/VarType.js"></script> <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script> <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> @@ -96,7 +96,7 @@ local function submenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a><%- +<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a><%- submenu(prefix .. v.name .. "/", nnode) %></li> <%- @@ -122,7 +122,7 @@ if cattree and cattree.nodes then local href = controller.."/"..category.."/"..k.name.."/" href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> -<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=pcdata(node.title)%></a><% +<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a><% submenu("/" .. category .. "/" .. k.name .. "/", node) %></li><% end end @@ -133,7 +133,7 @@ end <ul id="modemenu"><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> -<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(node.title)%></a></li><% +<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(striptags(node.title))%></a></li><% end end %> diff --git a/themes/oxygen/luasrc/view/themes/oxygen/header.htm b/themes/oxygen/luasrc/view/themes/oxygen/header.htm index 9b951e8a6..01c5afdfd 100644 --- a/themes/oxygen/luasrc/view/themes/oxygen/header.htm +++ b/themes/oxygen/luasrc/view/themes/oxygen/header.htm @@ -1,4 +1,4 @@ -<%# +a<%# LuCI - Lua Configuration Interface Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> @@ -44,7 +44,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/dashboard.css" /> <% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" /> <% end -%> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> <div id="screen"> @@ -77,7 +77,7 @@ local function ucimenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<span><a class="menulink<% if nnode._menu_selected then %> active<%end%>" href="<%=luci.util.pcdata(href)%>"> > <%=pcdata(nnode.title)%></a></span> +<span><a class="menulink<% if nnode._menu_selected then %> active<%end%>" href="<%=pcdata(href)%>"> > <%=pcdata(striptags(nnode.title))%></a></span> <%- end end @@ -119,7 +119,7 @@ ucimenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"], "changes" if pointer.nodes and pointer.nodes[v] then pointer = pointer.nodes[v] %> - » <a href="<%=luci.dispatcher.build_url(unpack(crequest, 1, k))%>"><%=pcdata(pointer.title or v)%></a> + » <a href="<%=luci.dispatcher.build_url(unpack(crequest, 1, k))%>"><%=pcdata(striptags(pointer.title or v))%></a> <% end end |