From 8ef5ca4eacabc38d24cbd2528f646bc50b9ec44d Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 30 Dec 2015 13:53:56 +0000
Subject: Change listfiles filesize to size, size and mtime not user-friendly,
 use posix.stat over fs.stat, use new format functions

---
 clamav-listfiles-html.lsp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'clamav-listfiles-html.lsp')

diff --git a/clamav-listfiles-html.lsp b/clamav-listfiles-html.lsp
index 97ec1ff..2c7d384 100644
--- a/clamav-listfiles-html.lsp
+++ b/clamav-listfiles-html.lsp
@@ -3,20 +3,6 @@ htmlviewfunctions = require("htmlviewfunctions")
 html = require("acf.html")
 %>
 
-<%
-function convertsize(size)
-	if string.find(size, "k$") then
-		return tonumber(string.match(size, "[%d.]*")) * 1024.0
-	elseif string.find(size, "M$") then
-		return tonumber(string.match(size, "[%d.]*")) * 1024.0 * 1024.0
-	elseif string.find(size, "G$") then
-		return tonumber(string.match(size, "[%d.]*")) + 1024.0 * 1024.0 * 1024.0
-	else
-		return tonumber(string.match(size, "[%d.]*"))
-	end
-end
-%>
-
 <script type="text/javascript">
 	if (typeof jQuery == 'undefined') {
 		document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>');
@@ -58,8 +44,8 @@ end %>
 	<tr>
 		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="Edit", action="expert"}), page_info, -1) %></td>
 		<td><%= html.html_escape(file.filename) %></td>
-		<td><span class="hide"><%= convertsize(file.filesize) %>b</span><%= html.html_escape(file.filesize) %></td>
-		<td><%= html.html_escape(file.mtime) %></td>
+		<td><span class="hide"><%= html.html_escape(file.size or 0) %>b</span><%= format.formatfilesize(file.size) %></td>
+		<td><%= format.formattime(file.mtime) %></td>
 	</tr>
 <% end %>
 </tbody></table>
-- 
cgit v1.2.3