Changed viewfunctions.lua to htmlviewfunctions.lua and made it an actual module

It should have been a module all along, but wasn't
Unfortunately, this means changes to pretty much every view file

16 files changed, 51 insertions, 60 deletions

diff --git a/app/acf-util/logon-html.lsp b/app/acf-util/logon-html.lsp
index 2400c90..29ced43 100644
--- a/app/acf-util/logon-html.lsp
+++ b/app/acf-util/logon-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
 <script type="text/javascript">
@@ -13,5 +13,5 @@
 	form.value.password.type = "password"
 	form.value.redir.type = "hidden"
 	local order = { "userid", "password" }
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/app/acf-util/logon-logout-html.lsp b/app/acf-util/logon-logout-html.lsp
index 54aa9bb..765eb4f 100644
--- a/app/acf-util/logon-logout-html.lsp
+++ b/app/acf-util/logon-logout-html.lsp
@@ -1,7 +1,7 @@
 <% local view= ... %> 
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 <h1>Log Out</h1>
 
-<%= cfe_unpack(view) %>
+<%= htmlviewfunctions.cfe_unpack(view) %>
 
 <%= html.html_escape(view.logout.value) %>
diff --git a/app/acf-util/password-html.lsp b/app/acf-util/password-html.lsp
index 82551fc..bc50fb7 100644
--- a/app/acf-util/password-html.lsp
+++ b/app/acf-util/password-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, pageinfo = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <% 
@@ -12,5 +12,5 @@
 		form.value.userid.readonly = true
 	end
 	local order = { "userid", "username", "roles", "password", "password_confirm" }
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index 01eafe7..58f194d 100644
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -1,7 +1,7 @@
 <% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"newuser", "edituser", "deleteuser"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"newuser", "edituser", "deleteuser"}, session) %>
 
 <H1>User Accounts</H1>
 <H2>Create new account</H2>
diff --git a/app/acf-util/roles-editrole-html.lsp b/app/acf-util/roles-editrole-html.lsp
index 5d1582f..d464cd1 100644
--- a/app/acf-util/roles-editrole-html.lsp
+++ b/app/acf-util/roles-editrole-html.lsp
@@ -1,14 +1,14 @@
 <% local form, viewtable, page_info = ... %> 
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <%
-	displayformstart(form, page_info)
+	htmlviewfunctions.displayformstart(form, page_info)
 	-- If editing existing role, disable role
 	if page_info.action ~= "newrole" then
 		form.value.role.readonly = true
 	end
-	displayformitem(form.value.role, "role")
+	htmlviewfunctions.displayformitem(form.value.role, "role")
 
 	-- copied this code from viewfunctions so we can disable the default boxes
 	local myitem = form.value.permissions
@@ -63,5 +63,5 @@
 	if myitem.errtxt then io.write('<P CLASS="error">' .. string.gsub(html.html_escape(myitem.errtxt), "\n", "<BR>") .. "</P>\n") end
 	io.write("</DD>\n")
 
-	displayformend(form)
+	htmlviewfunctions.displayformend(form)
 %>
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index 5221fce..04b4a98 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -1,7 +1,7 @@
 <% local view, viewlibrary, page_info, session= ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"newrole", "editrole", "deleterole"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"newrole", "editrole", "deleterole"}, session) %>
 
 <H1>Roles</H1>
 <H2>Create new role</H2>
diff --git a/app/acf-util/skins-read-html.lsp b/app/acf-util/skins-read-html.lsp
index 95547a5..2d43b49 100644
--- a/app/acf-util/skins-read-html.lsp
+++ b/app/acf-util/skins-read-html.lsp
@@ -1,7 +1,7 @@
 <% local view, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"update"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"update"}, session) %>
 
 <h1>Available skins</h1>
 
diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp
index 85ff3a8..6a1fc17 100644
--- a/app/acf-util/welcome-html.lsp
+++ b/app/acf-util/welcome-html.lsp
@@ -1,10 +1,10 @@
 <% view = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 <h1>Alpine Configuration Framework</h1>
 <DL><p>Welcome.</p></DL>
 
 <% --[[
-	io.write(cfe_unpack(view))
-	io.write(cfe_unpack(FORM))
-	io.write(cfe_unpack(ENV))
+	io.write(htmlviewfunctions.cfe_unpack(view))
+	io.write(htmlviewfunctions.cfe_unpack(FORM))
+	io.write(htmlviewfunctions.cfe_unpack(ENV))
 --]] %>
diff --git a/app/debug-html.lsp b/app/debug-html.lsp
index f9d160b..ee49434 100644
--- a/app/debug-html.lsp
+++ b/app/debug-html.lsp
@@ -1,9 +1,9 @@
 <% local data, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 <H1>Debugging</H1>
 <H2>View Data:</H2>
-<%= cfe_unpack(data) %>
+<%= htmlviewfunctions.cfe_unpack(data) %>
 <H2>Session:</H2>
-<%= cfe_unpack(session) %>
+<%= htmlviewfunctions.cfe_unpack(session) %>
 <H2>Page Info:</H2>
-<%= cfe_unpack(page_info) %>
+<%= htmlviewfunctions.cfe_unpack(page_info) %>
diff --git a/app/expert-html.lsp b/app/expert-html.lsp
index 5db9173..ce8d397 100644
--- a/app/expert-html.lsp
+++ b/app/expert-html.lsp
@@ -1,5 +1,4 @@
 <% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("status")
diff --git a/app/filedetails-html.lsp b/app/filedetails-html.lsp
index 6b5a2f3..101861d 100644
--- a/app/filedetails-html.lsp
+++ b/app/filedetails-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <% if form.type == "form" then %>
 <H1>Configuration</H1>
@@ -10,16 +10,16 @@
 <H3>File Details</H3>
 <DL>
 <% 
-displayitem(form.value.filename)
-displayitem(form.value.filesize)
-displayitem(form.value.mtime)
+htmlviewfunctions.displayitem(form.value.filename)
+htmlviewfunctions.displayitem(form.value.filesize)
+htmlviewfunctions.displayitem(form.value.mtime)
 %>
 </DL>
 
 <H3>File Content</H3>
 <% if form.type == "form" then %>
 <% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %>
-<% displayformstart(form) %>
+<% htmlviewfunctions.displayformstart(form) %>
 <input type="hidden" name="filename" value="<%= html.html_escape(form.value.filename.value) %>">
 <% else %>
 <DL>
@@ -31,7 +31,7 @@ displayitem(form.value.mtime)
 <% if form.value.filecontent.descr then %><P CLASS='descr'><%= string.gsub(html.html_escape(form.value.filecontent.descr), "\n", "<BR>") %></P><% end %>
 
 <% if form.type == "form" then %>
-<% displayformend(form) %>
+<% htmlviewfunctions.displayformend(form) %>
 <% else %>
 </DL>
 <% end %>
diff --git a/app/form-html.lsp b/app/form-html.lsp
index c427580..26389b9 100644
--- a/app/form-html.lsp
+++ b/app/form-html.lsp
@@ -1,8 +1,8 @@
 <% local form, viewlibrary, page_info = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <%
-	displayform(form, nil, nil, page_info, 2)
+	htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
 %>
diff --git a/app/status-html.lsp b/app/status-html.lsp
index 5518c04..3b578a9 100644
--- a/app/status-html.lsp
+++ b/app/status-html.lsp
@@ -1,16 +1,16 @@
 <% local data, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
-<% displaycommandresults({"install","edit"}, session) %>
-<% displaycommandresults({"startstop"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"install","edit"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"startstop"}, session) %>
 
 <H1>System Info</H1>
 <DL>
 <%
-displayitem(data.value.status)
+htmlviewfunctions.displayitem(data.value.status)
 
-displayitem(data.value.version)
+htmlviewfunctions.displayitem(data.value.version)
 if data.value.version and data.value.version.errtxt and viewlibrary.check_permission("apk-tools/apk/install") then
 %>
 	<DT>Install package</DT>
@@ -20,7 +20,7 @@ if data.value.version and data.value.version.errtxt and viewlibrary.check_permis
 <%
 end
 
-displayitem(data.value.autostart)
+htmlviewfunctions.displayitem(data.value.autostart)
 if not (data.value.version and data.value.version.errtxt) and data.value.autostart and data.value.autostart.errtxt and viewlibrary.check_permission("alpine-baselayout/rc/edit") then
 %>
 	<DT>Enable autostart</DT>
diff --git a/lib/Makefile b/lib/Makefile
index d8b1f0a..e1e616b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -5,7 +5,7 @@ LIB_DIST=menubuilder.lua\
 	authenticator.lua\
 	authenticator-plaintext.lua\
 	roles.lua\
-	viewfunctions.lua\
+	htmlviewfunctions.lua\
 	controllerfunctions.lua\
 	modelfunctions.lua\
 
diff --git a/lib/README b/lib/README
index 7de932a..0931934 100644
--- a/lib/README
+++ b/lib/README
@@ -18,4 +18,4 @@ processinfo.lua - Start/stop, find running, find version - process helpers
 roles.lua - Used to determine roles and permissions
 session.lua - Helps with Session mangement in ACF
 validator.lua - Validate web input for ACF. 
-viewfunctions.lua - Common view functions
+htmlviewfunctions.lua - Common functions for HTML views
diff --git a/lib/viewfunctions.lua b/lib/htmlviewfunctions.lua
index e447fc3..ef59485 100644
--- a/lib/viewfunctions.lua
+++ b/lib/htmlviewfunctions.lua
@@ -1,7 +1,9 @@
+module(..., package.seeall)
+
 html = require("acf.html")
 require("session")
 
-function getlabel(myitem, value)
+local function getlabel(myitem, value)
 	if myitem and (myitem.type == "select" or myitem.type == "multi") then
 		for x,val in ipairs(myitem.option) do
 			local v,l
@@ -20,10 +22,14 @@ function getlabel(myitem, value)
 	return tostring(value)
 end
 
-function displayitemcustom(myitem, header_level)
+function displayitem(myitem, header_level, page_info)
 	if not myitem then return end
-	if myitem.type == "group" then
-		header_level = header_level or 2
+	if myitem.type == "form" then
+		header_level = header_level or 1
+		io.write("<H"..tostring(header_level)..">"..html.html_escape(myitem.label).."</H"..tostring(header_level)..">")
+		displayform(myitem, nil, nil, page_info, header_level)
+	elseif myitem.type == "group" then
+		header_level = header_level or 1
 		io.write("<H"..tostring(header_level)..">"..html.html_escape(myitem.label).."</H"..tostring(header_level)..">")
 		if myitem.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(myitem.descr), "\n", "<BR>") .. "</P>\n") end
 		if myitem.errtxt then io.write('<P CLASS="error">' .. string.gsub(html.html_escape(myitem.errtxt), "\n", "<BR>") .. "</P>\n") end
@@ -43,7 +49,7 @@ function displayitemcustom(myitem, header_level)
 		end
 		for x,name in ipairs(order) do
 			if myitem.value[name] then
-				displayitemcustom(myitem.value[name], tonumber(header_level)+1)
+				displayitem(myitem.value[name], tonumber(header_level)+1)
 			end
 		end
 	elseif myitem.type ~= "hidden" then
@@ -60,20 +66,6 @@ function displayitemcustom(myitem, header_level)
 		io.write("</DD>\n")
 	end
 end
-function displayitem(myitem)
-	if not myitem then return end
-	io.write("<DT")
-	if myitem.errtxt then 
-		myitem.class = "error"
-		io.write(" class='error'")
-	end
-	io.write(">" .. html.html_escape(myitem.label) .. "</DT>\n")
-	io.write("<DD>")
-	io.write(string.gsub(html.html_escape(tostring(myitem.value)), "\n", "<BR>") .. "\n")
-	if myitem.descr then io.write("<P CLASS='descr'>" .. string.gsub(html.html_escape(myitem.descr), "\n", "<BR>") .. "</P>\n") end
-	if myitem.errtxt then io.write("<P CLASS='error'>" .. string.gsub(html.html_escape(myitem.errtxt), "\n", "<BR>") .. "</P>\n") end
-	io.write("</DD>\n")
-end
 
 function displayformitem(myitem, name, viewtype, header_level, group)
 	if not myitem then return end