diff options
| -rw-r--r-- | clamav-listfiles-html.lsp | 18 | ||||
| -rw-r--r-- | clamav-model.lua | 10 |
2 files changed, 7 insertions, 21 deletions
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> diff --git a/clamav-model.lua b/clamav-model.lua index f5c3240..370c4b3 100644 --- a/clamav-model.lua +++ b/clamav-model.lua @@ -2,6 +2,7 @@ local mymodule = {} -- Load libraries modelfunctions = require("modelfunctions") +posix = require("posix") fs = require("acf.fs") format = require("acf.format") @@ -38,13 +39,12 @@ function mymodule.getfilelist() local listed_files = {} for i,name in ipairs(filelist) do - local filedetails = fs.stat(name) or {} - table.insert ( listed_files , {filename=name, mtime=filedetails.mtime or "---", filesize=filedetails.size or "0"} ) + local filedetails = posix.stat(name) or {} + filedetails.filename = name + table.insert(listed_files, filedetails) end - table.sort(listed_files, function (a,b) return (a.filename < b.filename) end ) - - return cfe({ type="list", value=listed_files, label="ClamAV File List" }) + return cfe({ type="structure", value=listed_files, label="ClamAV File List" }) end function mymodule.getfiledetails(self, clientdata) |