Change file actions filesize to size, size and mtime not user-friendly, use posix.stat over fs.stat, use new format functions

3 files changed, 15 insertions, 15 deletions

diff --git a/provisioning-listfiles-html.lsp b/provisioning-listfiles-html.lsp
index 5763912..e92e43f 100644
--- a/provisioning-listfiles-html.lsp
+++ b/provisioning-listfiles-html.lsp
@@ -39,8 +39,8 @@ html = require("acf.html")
 	<tr>
 		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="Edit", action="editfile"}), page_info, -1) %></td>
 		<td><%= html.html_escape(file.filename) %></td>
-		<td><span class="hide"><%= html.html_escape(file.orig_size) %>b</span><%= html.html_escape(file.size) %></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/provisioning-listtemplates-html.lsp b/provisioning-listtemplates-html.lsp
index 579119d..47226d7 100644
--- a/provisioning-listtemplates-html.lsp
+++ b/provisioning-listtemplates-html.lsp
@@ -38,25 +38,25 @@ html = require("acf.html")
 </thead><tbody>
 <% local filename = cfe({ type="hidden", value="" }) %>
 <% local redir = cfe({ type="hidden", value=page_info.orig_action }) %>
-<% for k,v in ipairs( view.value ) do %>
+<% for i,file in ipairs( view.value ) do %>
 	<tr>
 		<td>
-		<% filename.value = v.filename %>
-		<% if viewlibrary.check_permission("edittemplate") and v.label then %>
+		<% filename.value = file.filename %>
+		<% if viewlibrary.check_permission("edittemplate") and file.label then %>
 			<% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="Edit", action="edittemplate"}), page_info, -1) %>
 		<% end %>
-		<% if viewlibrary.check_permission("deletetemplate") and v.label then %>
+		<% if viewlibrary.check_permission("deletetemplate") and file.label then %>
 			<% htmlviewfunctions.displayitem(cfe({type="form", value={filename=filename}, label="", option="Delete", action="deletetemplate", class="deletetemplate"}), page_info, -1) %>
 		<% end %>
-		<% if viewlibrary.check_permission("createtemplate") and not v.label then %>
+		<% if viewlibrary.check_permission("createtemplate") and not file.label then %>
 			<% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="Create", action="createtemplate"}), page_info, -1) %>
 		<% end %>
 		</td>
-                <td><%= html.html_escape(v.filename) %></td>
-                <td><%= html.html_escape(v.label) %></td>
-                <td><%= html.html_escape(v.seq) %></td>
-                <td><span class="hide"><%= html.html_escape(v.orig_size) %>b</span><%= html.html_escape(v.size) %></td>
-                <td><%= html.html_escape(v.mtime) %></td>
+                <td><%= html.html_escape(file.filename) %></td>
+                <td><%= html.html_escape(file.label) %></td>
+                <td><%= html.html_escape(file.seq) %></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>
diff --git a/provisioning-model.lua b/provisioning-model.lua
index 877a2b7..eac1623 100644
--- a/provisioning-model.lua
+++ b/provisioning-model.lua
@@ -571,7 +571,7 @@ mymodule.list_templates = function()
 	fs.create_directory(baseurl)
 	for f in posix.files(baseurl) do
 		local file = baseurl..f
-                local details = fs.stat(file)
+                local details = posix.stat(file)
 		if details.type == "regular" then
 			if not reversed[file] then
 				retval[#retval+1] = {filename=file}
@@ -621,7 +621,7 @@ mymodule.get_template = function(self, clientdata)
 		end
 	end
 	local filedetails = modelfunctions.getfiledetails(retval.filename.value, function(filename) return validator.is_valid_filename(filename, baseurl) end)
-	for i,n in ipairs({"filecontent", "filesize", "mtime"}) do
+	for i,n in ipairs({"filecontent", "size", "mtime"}) do
 		retval[n] = filedetails.value[n]
 	end
 
@@ -2020,7 +2020,7 @@ end
 function mymodule.list_files()
 	local retval = {}
 	for i,file in ipairs(scriptfiles) do
-		local details = fs.stat(file) or {}
+		local details = posix.stat(file) or {}
 		details.filename = file
 		table.insert(retval, details)
 	end