From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 16 Sep 2008 01:14:30 +0000 (+0000)
Subject: * luci/themes: fix xml errors triggered by query strings in menu entries
X-Git-Tag: 0.9.0~1285
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b11c6ecbeea88f782cef9c0441b3927d0c736a56;p=oweals%2Fluci.git

* luci/themes: fix xml errors triggered by query strings in menu entries
* luci/app-olsr: fix html error in mid table
---

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
index f7ad682fd..1d0bef739 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 <h1><%:olsrd_mid%></h1>
-<p><%:olsrd_mid_desc%></h1>
+<p><%:olsrd_mid_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
index ff5dd90e5..d93d9aee3 100644
--- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
+++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
@@ -55,7 +55,7 @@ require("luci.http").prepare_content("text/html")
 
 				var lis  = document.getElementById("mainmenu").getElementsByTagName("LI");
 				var divs = document.getElementById("mainmenu").getElementsByTagName("DIV");
-				
+
 				for( var i = 0; i < lis.length;  i++ ) ie_hover( lis[i]  );
 				for( var i = 0; i < divs.length; i++ ) ie_hover( divs[i] );
 			}
@@ -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="<%=href%>"><%=nnode.title%></a></span>
+			<span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a></span>
 			<%- submenu(prefix .. v.name .. "/", nnode) %>
 		</li>
 		<%- end %>
@@ -154,7 +154,7 @@ end
 	<%
 		if tree.nodes[category] and tree.nodes[category].ucidata then
 			local ucic = 0
-			
+
 			for i, j in pairs(require("luci.model.uci").cursor():changes()) do
 				for k, l in pairs(j) do
 					for m, n in pairs(l) do
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 356ae369b..31b1ad017 100644
--- a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
+++ b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
@@ -55,7 +55,7 @@ require("luci.http").prepare_content("text/html")
 
 				var lis  = document.getElementById("mainmenu").getElementsByTagName("LI");
 				var divs = document.getElementById("mainmenu").getElementsByTagName("DIV");
-				
+
 				for( var i = 0; i < lis.length;  i++ ) ie_hover( lis[i]  );
 				for( var i = 0; i < divs.length; i++ ) ie_hover( divs[i] );
 			}
@@ -117,7 +117,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="<%=href%>"><%=nnode.title%></a></span>
+			<span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a></span>
 			<%- submenu(prefix .. v.name .. "/", nnode) %>
 		</li>
 		<%- 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 e8b3d5533..6e460d5b0 100644
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -55,7 +55,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
 
 				var lis  = document.getElementById("mainmenu").getElementsByTagName("LI");
 				var divs = document.getElementById("mainmenu").getElementsByTagName("DIV");
-				
+
 				for( var i = 0; i < lis.length;  i++ ) ie_hover( lis[i]  );
 				for( var i = 0; i < divs.length; i++ ) ie_hover( divs[i] );
 			}
@@ -118,7 +118,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="<%=href%>"><%=nnode.title%></a></span>
+			<span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a></span>
 			<%- submenu(prefix .. v.name .. "/", nnode) %>
 		</li>
 		<%- end %>