1 files changed, 16 insertions, 58 deletions
diff --git a/app/acf-util/password-html.lsp b/app/acf-util/password-html.lsp
index 5d4d488..a11d9e3 100755
--- a/app/acf-util/password-html.lsp
+++ b/app/acf-util/password-html.lsp
@@ -1,72 +1,30 @@
 <? local form = ... ?>
+<? require("viewfunctions") ?>
 <?
 --[[ DEBUG INFORMATION
 io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
 io.write(html.cfe_unpack(form))
+io.write(html.cfe_unpack(ENV))
+io.write(html.cfe_unpack(FORM))
 io.write("</span>")
 --]]
 ?>
-<?
-function displayinfo(myform,tags,viewtype)
-	io.write("\n<DL>")
-	for k,v in pairs(tags) do 
-		if (myform) and (myform[v]) and (myform[v]["value"]) then
-			local val = myform[v] 
-			if (val.type) and not (val.type == "hidden") then
-				io.write("\n\t<DT")
-				if (#val.errtxt > 0) then 
-					val.class = "error"
-					io.write(" class='error'")
-				end
-				io.write(">" .. val.label .. "</DT>")
-				io.write("\n\t\t<DD>")
-				if (viewtype == "viewonly") then
-					io.write(val.value)
-				elseif (viewtype == "roles") then
-					for k,v in pairs(form.config.availableroles.option) do
-						local checked = ""
-						if (type(form.config.roles.option) == "table") then
-							for kk,vv in pairs(form.config.roles.option) do
-								if (v == vv) then
-									checked = "checked='yes'"
-									break
-								end
-							end
-						end
-						io.write("\n\t\t\t" ..v .. ":<input class='checkbox' type='checkbox'  name='"..v.."'  value='"..v.."' " .. checked .. " > ")
-					end
-				else
-					io.write(html.form[val.type](val))
-				end
-				if (val.descr) and (#val.descr > 0) then io.write("\t\t<P CLASS='descr'>" .. string.gsub(val.descr, "\n", "<BR>") .. "</P>\n") end
-				if (#val.errtxt > 0) then io.write("\t\t<P CLASS='error'>" .. string.gsub(val.errtxt, "\n", "<BR>") .. "</P>") end
-				io.write("\n\t\t</DD>")
-			else
-				io.write(html.form[val.type](val))
-			end
-		end
-	end
-	io.write("\n</DL>")
-end
-?>
-
-<H1>CONFIG</H1>
-<H2>Settings</H2>
-<form name="settings" action="save" method="POST">
-<? 
-local myform = form.config 
-displayinfo(myform,{ "userid","orguserid", "username" })
-displayinfo(myform,{ "roles" },"roles")
-displayinfo(myform,{ "password","password_confirm" })
-?>
 
-<H2>Actions</H2>
+<H1><?= form.label ?></H1>
 <? 
-local myform = form.config 
-local tags = { "cmdsave", "cmddelete", }
-displayinfo(myform,tags)
+	form.action = ""
+	form.submit = "Save"
+	if form.value.password and form.value.password_confirm then
+		form.value.password.type = "password"
+		form.value.password_confirm.type = "password"
+	end
+	-- If not in newuser action, disable userid
+	if nil == string.find(ENV["PATH_INFO"], "/newuser") then
+		form.value.userid.contenteditable = false
+	end
+	local order = { "userid", "username", "roles", "password", "password_confirm" }
+	displayform(form, order)
 ?>
-</form>
 
 <?
 --[[ DEBUG INFORMATION