1 files changed, 17 insertions, 62 deletions

diff --git a/snort-expert-html.lsp b/snort-expert-html.lsp
index 2217089..2e4dc31 100644
--- a/snort-expert-html.lsp
+++ b/snort-expert-html.lsp
@@ -1,40 +1,19 @@
-<? local view = ... ?>
+<? 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(view))
+io.write(html.cfe_unpack(form))
 io.write("</span>")
 --]]
 ?>
-<?
-function displayinfo(myform,tags,viewonly)
-	for k,v in pairs(tags) do 
-		if (myform[v]) and (myform[v]["value"]) then
-			local val = myform[v] 
-			io.write("\t<DT")
-			if (#val.errtxt > 0) then 
-				val.class = "error"
-				io.write(" class='error'")
-			end
-			io.write(">" .. val.label .. "</DT>\n")
-			if (viewonly) then
-				io.write("\t\t<DD>" .. val.value .. "\n")
-			else
-				io.write("\t\t<DD>" .. html.form[val.type](val) .. "\n")
-			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>\n") end
-			io.write("\t\t</DD>\n")
-		end
-	end
-end
-?>
 
 <H1>SYSTEM INFO</H1>
 <DL>
 <? 
-local myform = view.status 
-local tags = { "status", "version", }
+local myform = form.status 
+local tags = { "status", "version", "autostart", }
 displayinfo(myform,tags,"viewonly")
 ?>
 </DL>
@@ -45,7 +24,7 @@ displayinfo(myform,tags,"viewonly")
 <h3>File details</h3>
 <DL>
 <? 
-local myform = view.file 
+local myform = form.file 
 local tags = { "filename", "filesize", "mtime", "sumerrors", }
 displayinfo(myform,tags,"viewonly")
 ?>
@@ -53,7 +32,7 @@ displayinfo(myform,tags,"viewonly")
 
 <H3>FILE CONTENT</H3>
 <? 
-local myform = view.file
+local myform = form.file
 io.write(html.form[myform.filecontent.type](myform.filecontent))
 ?>
 
@@ -65,38 +44,14 @@ displayinfo(myform,tags)
 ?>
 </DL>
 
-</form>
-
-<? -- MANAGEMENT BUTTONS
-local cmdform = view.management
-local cmdresult = view.cmdmanagement
-local tags = { "start", "stop", "restart" }
-if (cmdform) and (cmdform[tags[1]]) then
-
-	io.write('<form name="management" action="" method="POST">')
-	io.write('<H1>MANAGEMENT</H1>')
-	io.write('<dl>')
-	io.write('<dt>' .. cmdform[tags[1]]["label"] .. '</dt>')
-	io.write('<dd>')
-	for k,v in pairs(tags) do
-		if (cmdform[v]) then
-			io.write(html.form[cmdform[v].type](cmdform[v]))
-		end
-	end
-	io.write('</dd>')
-
-	if (cmdresult) and (cmdresult.action) and (#cmdresult.action.descr > 0) then
-		io.write('<dt>' .. cmdresult.label .. '</dt>')
-		io.write('<dd><pre>' .. cmdresult.action.descr .. '</pre></dd>')
-	end
-	io.write('</dl></form>')
-end ?>
-
 <?
---[[ DEBUG INFORMATION
-io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
-io.write(html.cfe_unpack(form))
-io.write("</span>")
---]]
+-- Management buttons
+local myform = form.management
+local tags = { "start", "stop", "restart" }
+if (myform) then
+	io.write("<H1>MANAGEMENT</H1>\n<DL>")
+	displaymanagement(myform,tags)
+	io.write("</DL>")
+end
 ?>
-
+</form>