From df80810456f4a13d48eba24bfa1fa79b360c8426 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Thu, 2 Feb 2012 20:59:08 +0000
Subject: 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
---
 app/acf-util/logon-html.lsp           |   4 +-
 app/acf-util/logon-logout-html.lsp    |   4 +-
 app/acf-util/password-html.lsp        |   4 +-
 app/acf-util/password-status-html.lsp |   4 +-
 app/acf-util/roles-editrole-html.lsp  |   8 +-
 app/acf-util/roles-viewroles-html.lsp |   4 +-
 app/acf-util/skins-read-html.lsp      |   4 +-
 app/acf-util/welcome-html.lsp         |   8 +-
 app/debug-html.lsp                    |   8 +-
 app/expert-html.lsp                   |   1 -
 app/filedetails-html.lsp              |  12 +-
 app/form-html.lsp                     |   4 +-
 app/status-html.lsp                   |  12 +-
 lib/Makefile                          |   2 +-
 lib/README                            |   2 +-
 lib/htmlviewfunctions.lua             | 362 +++++++++++++++++++++++++++++++++
 lib/viewfunctions.lua                 | 370 ----------------------------------
 17 files changed, 402 insertions(+), 411 deletions(-)
 create mode 100644 lib/htmlviewfunctions.lua
 delete mode 100644 lib/viewfunctions.lua

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/htmlviewfunctions.lua b/lib/htmlviewfunctions.lua
new file mode 100644
index 0000000..ef59485
--- /dev/null
+++ b/lib/htmlviewfunctions.lua
@@ -0,0 +1,362 @@
+module(..., package.seeall)
+
+html = require("acf.html")
+require("session")
+
+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
+			if type(val) == "string" then
+				v = val
+				l = val
+			else
+				v = val.value
+				l = val.label
+			end
+			if v == value then
+				return l
+			end
+		end
+	end
+	return tostring(value)
+end
+
+function displayitem(myitem, header_level, page_info)
+	if not myitem then return end
+	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
+		local seqorder = {}
+		local order = {}
+		for name,item in pairs(myitem.value) do
+			if tonumber(item.seq) then
+				seqorder[#seqorder+1] = {seq=tonumber(item.seq), name=name}
+			else
+				order[#order+1] = name
+			end
+		end
+		table.sort(seqorder, function(a,b) if a.seq ~= b.seq then return a.seq > b.seq else return a.name > b.name end end)
+		table.sort(order)
+		for i,val in ipairs(seqorder) do
+			table.insert(order, 1, val.name)
+		end
+		for x,name in ipairs(order) do
+			if myitem.value[name] then
+				displayitem(myitem.value[name], tonumber(header_level)+1)
+			end
+		end
+	elseif myitem.type ~= "hidden" then
+		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
+end
+
+function displayformitem(myitem, name, viewtype, header_level, group)
+	if not myitem then return end
+	if name then myitem.name = name end
+	if group and group ~= "" then myitem.name = group.."."..myitem.name end
+	if myitem.type ~= "hidden" and myitem.type ~= "group" then
+		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>\n")
+	end
+	if (viewtype == "viewonly") then
+		myitem.disabled = "true"
+	end
+	if myitem.type == "group" then
+		header_level = header_level or 2
+		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
+		displayformcontents(myitem, nil, nil, tonumber(header_level)+1, myitem.name)
+	elseif myitem.type == "multi" then
+		-- FIXME multiple select doesn't work in haserl, so use series of checkboxes
+		--myitem.type = "select"
+		--myitem.multiple = "true"
+		myitem.class = nil
+		local tempname = myitem.name
+		local tempval = myitem.value or {}
+		local reverseval = {}
+		for x,val in ipairs(tempval) do
+			reverseval[val] = x
+		end
+		local reverseopt = {}
+		for x,val in ipairs(myitem.option) do
+			local v,l
+			if type(val) == "string" then
+				v = val
+				l = val
+			else
+				v = val.value
+				l = val.label
+			end
+			reverseopt[v] = x
+			myitem.value = v
+			myitem.checked = reverseval[v]
+			myitem.name = tempname .. "." .. x
+			io.write(html.form.checkbox(myitem) .. html.html_escape(l) .. "<br>\n")
+		end
+		-- Check for values not in options
+		if myitem.errtxt then
+			myitem.class = "error"
+			io.write('<p class="error">\n')
+		end
+		for x,val in ipairs(tempval) do
+			if not reverseopt[val] then
+				myitem.value = val
+				myitem.checked = true
+				io.write(html.form.checkbox(myitem) .. html.html_escape(val) .. "<br>\n")
+			end
+		end
+		if myitem.errtxt then
+			io.write('</p>\n')
+		end
+		myitem.name = tempname
+		myitem.value = tempval
+	elseif myitem.type == "boolean" then
+		local tempval = myitem.value
+		if (myitem.value == true) then myitem.checked = "" end
+		myitem.value = "true"
+		io.write(html.form.checkbox(myitem) .. "\n")
+		myitem.value = tempval
+	elseif myitem.type == "list" then
+		local tempval = myitem.value
+		myitem.value = table.concat(myitem.value, "\n")
+		io.write(html.form.longtext(myitem) .. "\n")
+		myitem.value = tempval
+	else
+		io.write((html.form[myitem.type](myitem) or "") .. "\n")
+	end
+	if myitem.type ~= "hidden" and myitem.type ~= "group" then
+		if myitem.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(myitem.descr), "\n", "<BR>") .. "</P>\n") end
+		if myitem.default then io.write('<P CLASS="descr">Default:' .. string.gsub(html.html_escape(getlabel(myitem, myitem.default)), "\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
+end
+
+function displayformstart(myform, page_info)
+	if not myform then return end
+	if not myform.action and page_info then
+		myform.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
+	end
+	io.write('<DL>\n')
+	if myform.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(myform.descr), "\n", "<BR>") .. "</P>\n") end
+	if myform.errtxt then io.write('<P CLASS="error">' .. string.gsub(html.html_escape(myform.errtxt), "\n", "<BR>") .. "</P>\n") end
+	io.write('<form action="' .. html.html_escape(myform.action) .. '" ')
+	if myform.enctype and myform.enctype ~= "" then
+		io.write('enctype="'..html.html_escape(myform.enctype)..'" ')
+	end
+	io.write('method="POST">\n')
+	if myform.value.redir then
+		displayformitem(myform.value.redir, "redir")
+	end
+end
+
+function displayformcontents(myform, order, finishingorder, header_level, group)
+	if not myform then return end
+	if not order and not finishingorder then
+		tmporder = {}
+		for name,item in pairs(myform.value) do
+			if tonumber(item.seq) then
+				tmporder[#tmporder+1] = {seq=tonumber(item.seq), name=name}
+			end
+		end
+		if #tmporder>0 then
+			table.sort(tmporder, function(a,b) if a.seq ~= b.seq then return a.seq < b.seq else return a.name < b.name end end)
+			order = {}
+			for i,val in ipairs(tmporder) do
+				order[#order+1] = val.name
+			end
+		end
+	end
+	local reverseorder= {["redir"]=0}
+	if order then
+		for x,name in ipairs(order) do
+			reverseorder[name] = x
+			if myform.value[name] then
+				myform.value[name].name = name
+				displayformitem(myform.value[name], nil, nil, header_level, group)
+			end
+		end
+	end
+	local reversefinishingorder = {}
+	if finishingorder then
+		for x,name in ipairs(finishingorder) do
+			reversefinishingorder[name] = x
+		end
+	end
+	for name,item in pairs(myform.value) do
+		if nil == reverseorder[name] and nil == reversefinishingorder[name] then
+			item.name = name
+			displayformitem(item, nil, nil, header_level, group)
+		end
+	end
+	if finishingorder then
+		for x,name in ipairs(finishingorder) do
+			if myform.value[name] then
+				myform.value[name].name = name
+				displayformitem(myform.value[name], nil, nil, header_level, group)
+			end
+		end
+	end
+end
+
+function displayformend(myform)
+	if not myform then return end
+	io.write('<DT></DT><DD><input class="submit" type="submit" name="' .. html.html_escape(myform.option) .. '" value="' .. html.html_escape(myform.submit or myform.option) .. '"></DD>\n')
+	io.write('</FORM>')
+	io.write('</DL>\n')
+end
+
+function displayform(myform, order, finishingorder, page_info, header_level)
+	if not myform then return end
+	displayformstart(myform, page_info)
+	displayformcontents(myform, order, finishingorder, header_level)
+	displayformend(myform)
+end
+
+function displaycommandresults(commands, session, preserveerrors)
+	local cmdresult = {}
+	for i,cmd in ipairs(commands) do
+		if session[cmd.."result"] then
+			cmdresult[#cmdresult + 1] = session[cmd.."result"]
+			if not preserveerrors or not session[cmd.."result"].errtxt then
+				session[cmd.."result"] = nil
+			end
+		end
+	end
+	if #cmdresult > 0 then
+		io.write("<H1>Command Result</H1>\n<DL>\n")
+		for i,result in ipairs(cmdresult) do
+			if type(result.value) == "string" and result.value ~= "" then io.write(string.gsub(html.html_escape(result.value), "\n", "<BR>") .. "\n") end
+			if result.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(result.descr), "\n", "<BR>") .. "</P>\n") end
+			if result.errtxt then io.write('<P CLASS="error">' .. string.gsub(html.html_escape(result.errtxt), "\n", "<BR>") .. "</P>\n") end
+		end
+		io.write("</DL>\n")
+	end
+end
+
+-- Divide up data into pages of size pagesize
+-- clientdata can be a page number or a table where clientdata.page is the page number
+function paginate(data, clientdata, pagesize)
+	local subset = data
+	local page_data = { numpages=1, page=1, pagesize=pagesize, num=#data }
+	if #data > pagesize then
+		page_data.numpages = math.floor((#data + pagesize -1)/pagesize)
+		if clientdata and clientdata.page and tonumber(clientdata.page) then
+			page_data.page = tonumber(clientdata.page)
+		elseif clientdata and tonumber(clientdata) then
+			page_data.page = tonumber(clientdata)
+		end
+		if page_data.page > page_data.numpages then
+			page_data.page = page_data.numpages
+		elseif page_data.page < 0 then
+			page_data.page = 0
+		end
+		if page_data.page > 0 then
+			subset = {}
+			for i=((page_data.page-1)*pagesize)+1, page_data.page*pagesize do
+				table.insert(subset, data[i])
+			end
+		end
+	end
+	return subset, page_data
+end
+
+function displaypagination(page_data, page_info)
+	local min, max
+	if page_data.page == 0 then
+		min = 1
+		max = page_data.num
+	else
+		min = math.min(((page_data.page-1)*page_data.pagesize)+1, page_data.num)
+		max = math.min(page_data.page*page_data.pagesize, page_data.num)
+	end
+	if min == max then
+		io.write("Record "..min.." of "..page_data.num.."\n")
+	else
+		io.write("Records "..min.."-"..max.." of "..page_data.num.."\n")
+	end
+
+	if page_data.numpages > 1 then
+		-- Pre-determine the links for each page
+		local link = page_info.script .. page_info.orig_action .. "?"
+		local clientdata = {}
+		for name,val in pairs(page_info.clientdata) do
+			if name ~= "sessionid" and name ~= "page" then
+				clientdata[#clientdata + 1] = name.."="..val
+			end
+		end
+		if #clientdata > 0 then
+			link = link .. table.concat(clientdata, "&") .. "&"
+		end
+		link = link.."page="
+
+		function pagelink(page)
+			io.write(html.link{value=link..page, label=page}.."\n")
+		end
+
+		-- Print out < 1 n-50 n-25 n-10 n-2 n-1 n n+1 n+2 n+10 n+25 n+50 numpages >
+		io.write('<div align="right">Pages:')
+		local p = page_data.page
+		if p > 1 then
+			io.write("<a href="..link..(p-1).."><img SRC='"..html.html_escape(page_info.staticdir).."/tango/16x16/actions/go-previous.png' HEIGHT='16' WIDTH='16'></a>\n")
+		end
+		if p ~= 1 then
+			pagelink(1)
+		end
+		local links = {(p-3)-(p-3)%10, p-2, p-1, p, p+1, p+2, (p+12)-(p+12)%10}
+		table.insert(links, 1, links[1]-1-(links[1]-1)%25)
+		table.insert(links, 1, links[1]-1-(links[1]-1)%50)
+		table.insert(links, links[#links]+25-links[#links]%25)
+		table.insert(links, links[#links]+50-links[#links]%50)
+		for i,num in ipairs(links) do
+			if num==p and p~=0 then
+				io.write(p.."\n")
+			elseif num>1 and num<page_data.numpages then
+				pagelink(num)
+			end
+		end
+		if p<page_data.numpages then
+			pagelink(page_data.numpages)
+			if p~= 0 then
+				io.write("<a href="..link..(p+1).."><img SRC='"..html.html_escape(page_info.staticdir).."/tango/16x16/actions/go-next.png' HEIGHT='16' WIDTH='16'></a>\n")
+			end
+		end
+		if p~=0 then
+			io.write(html.link{value=link.."0", label="all"}.."\n")
+		end
+		io.write("</div>")
+	end
+end
+
+-- give a cfe and get back a string of what is inside
+-- great for troubleshooting and seeing what is really being passed to the view
+function cfe_unpack ( a )
+	if type(a) == "table" then
+		value = session.serialize("cfe", a)
+		value = "<pre>" .. html.html_escape(value) .. "</pre>"
+		return value
+	end
+end
diff --git a/lib/viewfunctions.lua b/lib/viewfunctions.lua
deleted file mode 100644
index e447fc3..0000000
--- a/lib/viewfunctions.lua
+++ /dev/null
@@ -1,370 +0,0 @@
-html = require("acf.html")
-require("session")
-
-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
-			if type(val) == "string" then
-				v = val
-				l = val
-			else
-				v = val.value
-				l = val.label
-			end
-			if v == value then
-				return l
-			end
-		end
-	end
-	return tostring(value)
-end
-
-function displayitemcustom(myitem, header_level)
-	if not myitem then return end
-	if myitem.type == "group" then
-		header_level = header_level or 2
-		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
-		local seqorder = {}
-		local order = {}
-		for name,item in pairs(myitem.value) do
-			if tonumber(item.seq) then
-				seqorder[#seqorder+1] = {seq=tonumber(item.seq), name=name}
-			else
-				order[#order+1] = name
-			end
-		end
-		table.sort(seqorder, function(a,b) if a.seq ~= b.seq then return a.seq > b.seq else return a.name > b.name end end)
-		table.sort(order)
-		for i,val in ipairs(seqorder) do
-			table.insert(order, 1, val.name)
-		end
-		for x,name in ipairs(order) do
-			if myitem.value[name] then
-				displayitemcustom(myitem.value[name], tonumber(header_level)+1)
-			end
-		end
-	elseif myitem.type ~= "hidden" then
-		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
-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
-	if name then myitem.name = name end
-	if group and group ~= "" then myitem.name = group.."."..myitem.name end
-	if myitem.type ~= "hidden" and myitem.type ~= "group" then
-		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>\n")
-	end
-	if (viewtype == "viewonly") then
-		myitem.disabled = "true"
-	end
-	if myitem.type == "group" then
-		header_level = header_level or 2
-		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
-		displayformcontents(myitem, nil, nil, tonumber(header_level)+1, myitem.name)
-	elseif myitem.type == "multi" then
-		-- FIXME multiple select doesn't work in haserl, so use series of checkboxes
-		--myitem.type = "select"
-		--myitem.multiple = "true"
-		myitem.class = nil
-		local tempname = myitem.name
-		local tempval = myitem.value or {}
-		local reverseval = {}
-		for x,val in ipairs(tempval) do
-			reverseval[val] = x
-		end
-		local reverseopt = {}
-		for x,val in ipairs(myitem.option) do
-			local v,l
-			if type(val) == "string" then
-				v = val
-				l = val
-			else
-				v = val.value
-				l = val.label
-			end
-			reverseopt[v] = x
-			myitem.value = v
-			myitem.checked = reverseval[v]
-			myitem.name = tempname .. "." .. x
-			io.write(html.form.checkbox(myitem) .. html.html_escape(l) .. "<br>\n")
-		end
-		-- Check for values not in options
-		if myitem.errtxt then
-			myitem.class = "error"
-			io.write('<p class="error">\n')
-		end
-		for x,val in ipairs(tempval) do
-			if not reverseopt[val] then
-				myitem.value = val
-				myitem.checked = true
-				io.write(html.form.checkbox(myitem) .. html.html_escape(val) .. "<br>\n")
-			end
-		end
-		if myitem.errtxt then
-			io.write('</p>\n')
-		end
-		myitem.name = tempname
-		myitem.value = tempval
-	elseif myitem.type == "boolean" then
-		local tempval = myitem.value
-		if (myitem.value == true) then myitem.checked = "" end
-		myitem.value = "true"
-		io.write(html.form.checkbox(myitem) .. "\n")
-		myitem.value = tempval
-	elseif myitem.type == "list" then
-		local tempval = myitem.value
-		myitem.value = table.concat(myitem.value, "\n")
-		io.write(html.form.longtext(myitem) .. "\n")
-		myitem.value = tempval
-	else
-		io.write((html.form[myitem.type](myitem) or "") .. "\n")
-	end
-	if myitem.type ~= "hidden" and myitem.type ~= "group" then
-		if myitem.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(myitem.descr), "\n", "<BR>") .. "</P>\n") end
-		if myitem.default then io.write('<P CLASS="descr">Default:' .. string.gsub(html.html_escape(getlabel(myitem, myitem.default)), "\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
-end
-
-function displayformstart(myform, page_info)
-	if not myform then return end
-	if not myform.action and page_info then
-		myform.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
-	end
-	io.write('<DL>\n')
-	if myform.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(myform.descr), "\n", "<BR>") .. "</P>\n") end
-	if myform.errtxt then io.write('<P CLASS="error">' .. string.gsub(html.html_escape(myform.errtxt), "\n", "<BR>") .. "</P>\n") end
-	io.write('<form action="' .. html.html_escape(myform.action) .. '" ')
-	if myform.enctype and myform.enctype ~= "" then
-		io.write('enctype="'..html.html_escape(myform.enctype)..'" ')
-	end
-	io.write('method="POST">\n')
-	if myform.value.redir then
-		displayformitem(myform.value.redir, "redir")
-	end
-end
-
-function displayformcontents(myform, order, finishingorder, header_level, group)
-	if not myform then return end
-	if not order and not finishingorder then
-		tmporder = {}
-		for name,item in pairs(myform.value) do
-			if tonumber(item.seq) then
-				tmporder[#tmporder+1] = {seq=tonumber(item.seq), name=name}
-			end
-		end
-		if #tmporder>0 then
-			table.sort(tmporder, function(a,b) if a.seq ~= b.seq then return a.seq < b.seq else return a.name < b.name end end)
-			order = {}
-			for i,val in ipairs(tmporder) do
-				order[#order+1] = val.name
-			end
-		end
-	end
-	local reverseorder= {["redir"]=0}
-	if order then
-		for x,name in ipairs(order) do
-			reverseorder[name] = x
-			if myform.value[name] then
-				myform.value[name].name = name
-				displayformitem(myform.value[name], nil, nil, header_level, group)
-			end
-		end
-	end
-	local reversefinishingorder = {}
-	if finishingorder then
-		for x,name in ipairs(finishingorder) do
-			reversefinishingorder[name] = x
-		end
-	end
-	for name,item in pairs(myform.value) do
-		if nil == reverseorder[name] and nil == reversefinishingorder[name] then
-			item.name = name
-			displayformitem(item, nil, nil, header_level, group)
-		end
-	end
-	if finishingorder then
-		for x,name in ipairs(finishingorder) do
-			if myform.value[name] then
-				myform.value[name].name = name
-				displayformitem(myform.value[name], nil, nil, header_level, group)
-			end
-		end
-	end
-end
-
-function displayformend(myform)
-	if not myform then return end
-	io.write('<DT></DT><DD><input class="submit" type="submit" name="' .. html.html_escape(myform.option) .. '" value="' .. html.html_escape(myform.submit or myform.option) .. '"></DD>\n')
-	io.write('</FORM>')
-	io.write('</DL>\n')
-end
-
-function displayform(myform, order, finishingorder, page_info, header_level)
-	if not myform then return end
-	displayformstart(myform, page_info)
-	displayformcontents(myform, order, finishingorder, header_level)
-	displayformend(myform)
-end
-
-function displaycommandresults(commands, session, preserveerrors)
-	local cmdresult = {}
-	for i,cmd in ipairs(commands) do
-		if session[cmd.."result"] then
-			cmdresult[#cmdresult + 1] = session[cmd.."result"]
-			if not preserveerrors or not session[cmd.."result"].errtxt then
-				session[cmd.."result"] = nil
-			end
-		end
-	end
-	if #cmdresult > 0 then
-		io.write("<H1>Command Result</H1>\n<DL>\n")
-		for i,result in ipairs(cmdresult) do
-			if type(result.value) == "string" and result.value ~= "" then io.write(string.gsub(html.html_escape(result.value), "\n", "<BR>") .. "\n") end
-			if result.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(result.descr), "\n", "<BR>") .. "</P>\n") end
-			if result.errtxt then io.write('<P CLASS="error">' .. string.gsub(html.html_escape(result.errtxt), "\n", "<BR>") .. "</P>\n") end
-		end
-		io.write("</DL>\n")
-	end
-end
-
--- Divide up data into pages of size pagesize
--- clientdata can be a page number or a table where clientdata.page is the page number
-function paginate(data, clientdata, pagesize)
-	local subset = data
-	local page_data = { numpages=1, page=1, pagesize=pagesize, num=#data }
-	if #data > pagesize then
-		page_data.numpages = math.floor((#data + pagesize -1)/pagesize)
-		if clientdata and clientdata.page and tonumber(clientdata.page) then
-			page_data.page = tonumber(clientdata.page)
-		elseif clientdata and tonumber(clientdata) then
-			page_data.page = tonumber(clientdata)
-		end
-		if page_data.page > page_data.numpages then
-			page_data.page = page_data.numpages
-		elseif page_data.page < 0 then
-			page_data.page = 0
-		end
-		if page_data.page > 0 then
-			subset = {}
-			for i=((page_data.page-1)*pagesize)+1, page_data.page*pagesize do
-				table.insert(subset, data[i])
-			end
-		end
-	end
-	return subset, page_data
-end
-
-function displaypagination(page_data, page_info)
-	local min, max
-	if page_data.page == 0 then
-		min = 1
-		max = page_data.num
-	else
-		min = math.min(((page_data.page-1)*page_data.pagesize)+1, page_data.num)
-		max = math.min(page_data.page*page_data.pagesize, page_data.num)
-	end
-	if min == max then
-		io.write("Record "..min.." of "..page_data.num.."\n")
-	else
-		io.write("Records "..min.."-"..max.." of "..page_data.num.."\n")
-	end
-
-	if page_data.numpages > 1 then
-		-- Pre-determine the links for each page
-		local link = page_info.script .. page_info.orig_action .. "?"
-		local clientdata = {}
-		for name,val in pairs(page_info.clientdata) do
-			if name ~= "sessionid" and name ~= "page" then
-				clientdata[#clientdata + 1] = name.."="..val
-			end
-		end
-		if #clientdata > 0 then
-			link = link .. table.concat(clientdata, "&") .. "&"
-		end
-		link = link.."page="
-
-		function pagelink(page)
-			io.write(html.link{value=link..page, label=page}.."\n")
-		end
-
-		-- Print out < 1 n-50 n-25 n-10 n-2 n-1 n n+1 n+2 n+10 n+25 n+50 numpages >
-		io.write('<div align="right">Pages:')
-		local p = page_data.page
-		if p > 1 then
-			io.write("<a href="..link..(p-1).."><img SRC='"..html.html_escape(page_info.staticdir).."/tango/16x16/actions/go-previous.png' HEIGHT='16' WIDTH='16'></a>\n")
-		end
-		if p ~= 1 then
-			pagelink(1)
-		end
-		local links = {(p-3)-(p-3)%10, p-2, p-1, p, p+1, p+2, (p+12)-(p+12)%10}
-		table.insert(links, 1, links[1]-1-(links[1]-1)%25)
-		table.insert(links, 1, links[1]-1-(links[1]-1)%50)
-		table.insert(links, links[#links]+25-links[#links]%25)
-		table.insert(links, links[#links]+50-links[#links]%50)
-		for i,num in ipairs(links) do
-			if num==p and p~=0 then
-				io.write(p.."\n")
-			elseif num>1 and num<page_data.numpages then
-				pagelink(num)
-			end
-		end
-		if p<page_data.numpages then
-			pagelink(page_data.numpages)
-			if p~= 0 then
-				io.write("<a href="..link..(p+1).."><img SRC='"..html.html_escape(page_info.staticdir).."/tango/16x16/actions/go-next.png' HEIGHT='16' WIDTH='16'></a>\n")
-			end
-		end
-		if p~=0 then
-			io.write(html.link{value=link.."0", label="all"}.."\n")
-		end
-		io.write("</div>")
-	end
-end
-
--- give a cfe and get back a string of what is inside
--- great for troubleshooting and seeing what is really being passed to the view
-function cfe_unpack ( a )
-	if type(a) == "table" then
-		value = session.serialize("cfe", a)
-		value = "<pre>" .. html.html_escape(value) .. "</pre>"
-		return value
-	end
-end
-- 
cgit v1.2.3