1 files changed, 30 insertions, 31 deletions
diff --git a/ipsectools-status-html.lsp b/ipsectools-status-html.lsp
index b76acfe..463474c 100644
--- a/ipsectools-status-html.lsp
+++ b/ipsectools-status-html.lsp
@@ -35,50 +35,49 @@ informationform(myform,tags)
 </DL>
 
 <H2>PROGRAM SPECIFIC OPTIONS/INFORMATION</H2>
-
-<H3>Phase1</H3>
+<H3>Phase1 and Phase2 information</H3>
 <DL>
-
-<TABLE>
-<TR><TD CLASS='header'>Source</TD><TD CLASS='header'>Destination</TD><TD CLASS='header'>Cookies</TD><TD CLASS='header'>St</TD><TD CLASS='header'>S</TD><TD CLASS='header'>V</TD><TD CLASS='header'>E</TD><TD CLASS='header'>Created</TD><TD CLASS='header'>Phase2</TD></TR>
 <?
-local myform = form.status.show_isakmp2.value
+local myform = form.status.show_isakmp.option
 for k,v in pairs(myform) do
-	io.write("\t<TR>\n")
-	io.write("\t \t<TD>" .. (v['Source']['value'] or "") .. "</TD>\n")
-	io.write("\t \t<TD>" .. (v['Destination']['value'] or "") .. "</TD>\n")
-	io.write("\t \t<TD>" .. (v['Cookies']['value'] or "") .. "</TD>\n")
-	io.write("\t \t<TD>" .. (v['St']['value'] or "") .. "</TD>\n")
-	io.write("\t \t<TD>" .. (v['S']['value'] or "") .. "</TD>\n")
-	io.write("\t \t<TD>" .. (v['V']['value'] or "") .. "</TD>\n")
-	io.write("\t \t<TD>" .. (v['E']['value'] or "") .. "</TD>\n")
-	io.write("\t \t<TD>" .. (v['Created']['value'] or "") .. "</TD>\n")
-	io.write("\t \t<TD>" .. (v['Phase2']['value'] or "") .. "</TD>\n")
-	io.write("\t</TR>\n")
+	if (type(v) ==  "table") and (v.Destination) and (v.Destination.value) and (#v.Destination.value > 0) then
+		io.write("<DT><IMG SRC='/static/tango/16x16/status/network-")
+		if (tonumber(v['St']['value']) < 9) then
+			io.write("error")
+		else
+			io.write("idle")
+		end
+		io.write(".png' width='16' height='16'> ".. v['Destination']['value'] .. "</DT>")
+		io.write("<DD><TABLE>\n")
+		io.write("<TR><TD COLSPAN=2 CLASS='header'>Phase1 details</TD></TR>")
+		local tags = {"Created","Source", "St", "S", "E",}
+		for k1,v1 in pairs(tags) do
+			io.write("<TR><TD STYLE='font-weight:bold;width:120px;'>" .. 
+				(v[v1]['label'] or "") .. "</TD><TD>"..(v[v1]['value'] or ""))
+			if (v[v1]['descr']) and (#v[v1]['descr'] > 0) then io.write(" (".. v[v1]['descr'] .. ")") end
+			io.write("</TD></TR>")
+		end
+		io.write("<TR><TD COLSPAN=2 CLASS='header' STYLE='padding-left:15px;'>Phase2 details</TD></TR>")
+		for k1,v1 in pairs(v['Phase2']['option']) do
+			io.write("<TR><TD STYLE='padding-left:15px;' COLSPAN=2><PRE>" .. (v1['value'] or "") .. "</PRE>")
+			io.write("</TD></TR>")
+		end
+		io.write("</TABLE></DD>")
+	end
 end
 ?>
-</TABLE>
 </DL>
-
-<H3>Phase2</H3>
+<H3>Policy information</H3>
 <DL>
 <? 
-
-local myform = form.status.ip_xfrm_state
-io.write("\t\t<PRE>" .. myform.value .. "</PRE></P>\n")
-?>
-</DL>
-
-<H3>Policy</H3>
-<DL>
-<?
 local myform = form.status.ip_xfrm_policy
-io.write("\t\t<PRE>" .. myform.value .. "</PRE></P>\n")
+io.write("<DT>"..myform.label .."</DT>\n")
+io.write("<DD><PRE>"..myform.value .."</PRE></DT>\n")
 ?>
-
 </DL>
 
 
+
 <?
 --[[ DEBUG INFORMATION
 io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")