From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 7 Sep 2008 20:12:24 +0000 (+0000)
Subject: * luci/modules/admin-full: fix character encoding in package descriptions, fixes... 
X-Git-Tag: 0.9.0~1385
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a8c64ef3b09e8d64ae1c0497b9b852a0d98fdf64;p=oweals%2Fluci.git

* luci/modules/admin-full: fix character encoding in package descriptions, fixes #121
---

diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index d28b60cca..2794fd824 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -60,7 +60,7 @@ end
 					<input class="cbi-input-save" type="submit" name="submit" value="<%:ok%>" />
 				</div>
 			</div>
-		
+
 			<div class="cbi-value">
 				<label class="cbi-value-title"><%:filter%>:</label>
 				<div class="cbi-value-field">
@@ -68,7 +68,7 @@ end
 					<input type="submit" class="cbi-input-find" name="search" value="<%:a_s_packages_search%>" />
 				</div>
 			</div>
-			
+
 			<table class="cbi-section-table">
 				<tr class="cbi-section-table-titles">
 					<th class="cbi-section-table-cell"><%:a_s_packages_name%></th>
@@ -77,23 +77,23 @@ end
 					<th class="cbi-section-table-cell"><%:delete%></th>
 					<th class="cbi-section-table-cell"><%:descr%></th>
 				</tr>
-				<% for k, pkg in pairs(pkgs) do %>	
+				<% for k, pkg in pairs(pkgs) do %>
 				<tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
-					<td><%=pkg.Package%></td>
-					<td><%=pkg.Version%></td>
+					<td><%=luci.util.pcdata(pkg.Package)%></td>
+					<td><%=luci.util.pcdata(pkg.Version)%></td>
 					<td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed%><% end %></td>
 					<td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled%><% end %></td>
-					<td><%=pkg.Description%></td>
+					<td><%=luci.util.pcdata(pkg.Description)%></td>
 				</tr>
 				<% end %>
 			</table>
-			
+
 			<br />
-			
+
 			<div style="text-align: right">
 				<input type="submit" class="cbi-input-apply" name="submit" value="<%:a_s_packages_do%>" />
 			</div>
 		</fieldset></fieldset>
 	</div>
 </form>
-<%+footer%>
\ No newline at end of file
+<%+footer%>