From be8a05d0e4ae337d2cee99c3197f6ef5bf5c5779 Mon Sep 17 00:00:00 2001
From: Mika Havela <mika.havela@gmail.com>
Date: Tue, 8 Apr 2008 15:13:38 +0000
Subject: Cleaning up code.

git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@961 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 shorewall-expert-html.lsp | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

(limited to 'shorewall-expert-html.lsp')

diff --git a/shorewall-expert-html.lsp b/shorewall-expert-html.lsp
index 0f7126c..cc2242c 100644
--- a/shorewall-expert-html.lsp
+++ b/shorewall-expert-html.lsp
@@ -1,4 +1,6 @@
-<? local form = ... ?>
+<? local form = ... 
+require("viewfunctions")
+?>
 <?
 --[[ DEBUG INFORMATION
 io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
@@ -7,31 +9,11 @@ io.write("</span>")
 --]]
 ?>
 
-<?
-function informationform(myform,tags)
-	io.write("<DL>")
-	for k,v in pairs(tags) do 
-		if (myform[v]) then
-			local val = myform[v] 
-			io.write("\t<DT")
-			if (#val.errtxt > 0) then io.write(" class='error'") end
-			io.write(">" .. val.label .. "</DT>\n")
-
-			io.write("\t\t<DD>" .. val.value .. "\n")
-			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
-	io.write("</DL>")
-end
-?>
-
 <H1>SYSTEM INFO</H1>
 <? 
 local myform = form.status 
 local tags = { "status", "version", "autostart", }
-informationform(myform,tags)
+displayinfo(myform,tags,"viewonly")
 ?>
 
 <h1>CONFIGURATION</h1>
@@ -56,11 +38,3 @@ informationform(myform,tags)
 	</TR>
 <? end ?>
 </TABLE>
-
-<?
---[[ 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>")
---]]
-?>
-- 
cgit v1.2.3