Index: branches/stable/templates/axfr.tmpl
===================================================================
--- branches/stable/templates/axfr.tmpl	(revision 547)
+++ branches/stable/templates/axfr.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -5,7 +4,6 @@
 <td align="center" valign="top">
 
-<form action="dns.cgi" method="post">
+<form action="<TMPL_VAR NAME=script_self>" method="post">
 <fieldset>
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="axfr" />
 <input type="hidden" name="doit" value="y" />
Index: branches/stable/templates/badpage.tmpl
===================================================================
--- branches/stable/templates/badpage.tmpl	(revision 547)
+++ branches/stable/templates/badpage.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <div id="badpage">
 <TMPL_IF badpage>
Index: branches/stable/templates/bulkchange.tmpl
===================================================================
--- branches/stable/templates/bulkchange.tmpl	(revision 547)
+++ branches/stable/templates/bulkchange.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
Index: branches/stable/templates/bulkdomain.tmpl
===================================================================
--- branches/stable/templates/bulkdomain.tmpl	(revision 547)
+++ branches/stable/templates/bulkdomain.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -5,8 +4,7 @@
 <td align="center" valign="top">
 
-<form action="dns.cgi">
+<form action="<TMPL_VAR NAME=script_self>" method="post">
 <fieldset>
 
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="bulkchange" />
 <input type="hidden" name="offset" value="<TMPL_VAR NAME=offset>" />
Index: branches/stable/templates/deldom.tmpl
===================================================================
--- branches/stable/templates/deldom.tmpl	(revision 547)
+++ branches/stable/templates/deldom.tmpl	(revision 548)
@@ -5,6 +5,6 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete domain <TMPL_VAR NAME=domain>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=deldom&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="<TMPL_VAR NAME=script_self>&amp;page=deldom&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 
Index: branches/stable/templates/delgrp.tmpl
===================================================================
--- branches/stable/templates/delgrp.tmpl	(revision 547)
+++ branches/stable/templates/delgrp.tmpl	(revision 548)
@@ -5,6 +5,6 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete group <TMPL_VAR NAME=delgroupname>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delgrp&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delgrp&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=delgrp&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="<TMPL_VAR NAME=script_self>&amp;page=delgrp&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 
Index: branches/stable/templates/delloc.tmpl
===================================================================
--- branches/stable/templates/delloc.tmpl	(revision 547)
+++ branches/stable/templates/delloc.tmpl	(revision 548)
@@ -5,6 +5,6 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete location <TMPL_VAR NAME=location>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delloc&amp;del=cancel&amp;locid=<TMPL_VAR NAME=locid>">cancel</a> &nbsp; | &nbsp; 
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delloc&amp;del=ok&amp;locid=<TMPL_VAR NAME=locid>">confirm</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=delloc&amp;del=cancel&amp;locid=<TMPL_VAR NAME=locid>">cancel</a> &nbsp; | &nbsp; 
+<a href="<TMPL_VAR NAME=script_self>&amp;page=delloc&amp;del=ok&amp;locid=<TMPL_VAR NAME=locid>">confirm</a>
 </td></tr></table>
 
Index: branches/stable/templates/delrec.tmpl
===================================================================
--- branches/stable/templates/delrec.tmpl	(revision 547)
+++ branches/stable/templates/delrec.tmpl	(revision 548)
@@ -6,7 +6,7 @@
 <h3>Are you really sure you want to delete record:<br />
 <TMPL_VAR NAME=host> <TMPL_VAR NAME=ftype> <TMPL_VAR NAME=recval></h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrec&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;parentid=<TMPL_VAR NAME=parentid>">cancel</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=delrec&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;parentid=<TMPL_VAR NAME=parentid>">cancel</a>
  &nbsp; | &nbsp; 
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrec&amp;del=ok&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;parentid=<TMPL_VAR NAME=parentid>">confirm</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=delrec&amp;del=ok&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;parentid=<TMPL_VAR NAME=parentid>">confirm</a>
 </td></tr></table>
 
Index: branches/stable/templates/delrevzone.tmpl
===================================================================
--- branches/stable/templates/delrevzone.tmpl	(revision 547)
+++ branches/stable/templates/delrevzone.tmpl	(revision 548)
@@ -5,6 +5,6 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete reverse zone <TMPL_VAR NAME=revzone>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=delrevzone&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="<TMPL_VAR NAME=script_self>&amp;page=delrevzone&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 
Index: branches/stable/templates/deluser.tmpl
===================================================================
--- branches/stable/templates/deluser.tmpl	(revision 547)
+++ branches/stable/templates/deluser.tmpl	(revision 548)
@@ -5,6 +5,6 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete user <TMPL_VAR NAME=user>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=deluser&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="<TMPL_VAR NAME=script_self>&amp;page=deluser&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 
Index: branches/stable/templates/dns.css
===================================================================
--- branches/stable/templates/dns.css	(revision 547)
+++ branches/stable/templates/dns.css	(revision 548)
@@ -36,5 +36,5 @@
         background-color: #F0F0F0;
 }
-table.container {
+.container {
 	background-color: #FFFFFF;
 	border: none;
@@ -165,5 +165,5 @@
 	text-align: center;
 	padding: 5px;
-	width: 50%;
+	width: 55%;
 }
 .warning {
Index: branches/stable/templates/dnsq.tmpl
===================================================================
--- branches/stable/templates/dnsq.tmpl	(revision 547)
+++ branches/stable/templates/dnsq.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -7,7 +6,6 @@
 <TMPL_IF errmsg><div class="errmsg">Query error: <TMPL_VARNAME=errmsg></div></TMPL_IF>
 
-<form action="dns.cgi" method="post">
+<form action="<TMPL_VAR NAME=script_self>" method="post">
 <fieldset>
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="dnsq" />
 
Index: branches/stable/templates/domlist.tmpl
===================================================================
--- branches/stable/templates/domlist.tmpl	(revision 547)
+++ branches/stable/templates/domlist.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -18,7 +17,7 @@
 <TMPL_IF domain_create>
 <TMPL_IF domlist>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=newdomain">New Domain</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=newdomain">New Domain</a>
 <TMPL_ELSE>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=newrevzone">New Reverse Zone</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=newrevzone">New Reverse Zone</a>
 </TMPL_IF>
 </TMPL_IF>
@@ -28,6 +27,6 @@
 <table width="98%" border="0" cellspacing="4" cellpadding="3">
 <tr>
-<TMPL_LOOP NAME=colheads>	<td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="dns.cgi?sid=<TMPL_VAR
- NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
+<TMPL_LOOP NAME=colheads>	<td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="<TMPL_VAR
+ NAME=script_self>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
  NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR NAME=sortby>&amp;order=<TMPL_VAR NAME=order>"><TMPL_VAR
  NAME=colname></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>" src="images/<TMPL_VAR
@@ -40,11 +39,12 @@
 <TMPL_LOOP name=domtable>
 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
-	<td align="left"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=domain_id>&amp;defrec=n<TMPL_UNLESS domlist>&amp;revrec=y</TMPL_UNLESS>"><TMPL_VAR NAME=domain></a></td>
+	<td align="left"><a href="<TMPL_VAR NAME=script_self>&amp;page=reclist&amp;id=<TMPL_VAR NAME=domain_id>&amp;defrec=n<TMPL_UNLESS domlist>&amp;revrec=y</TMPL_UNLESS>"><TMPL_VAR NAME=domain></a></td>
 	<td><TMPL_IF status>Active<TMPL_ELSE>Inactive</TMPL_IF></td>
 	<td><TMPL_VAR name=group></td>
-<TMPL_IF domain_edit>	<td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=domainid>&amp;zonestatus=<TMPL_IF status>domoff<TMPL_ELSE>domon</TMPL_IF>"><TMPL_IF status>deactivate<TMPL_ELSE>activate</TMPL_IF></a></td></TMPL_IF>
-<TMPL_IF domain_delete>	<td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_IF domlist>deldom<TMPL_ELSE>delrevzone</TMPL_IF>&amp;id=<TMPL_VAR NAME=domain_id>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td></TMPL_IF>
+<TMPL_IF domain_edit>	<td align="center"><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=curpage><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=domainid>&amp;zonestatus=<TMPL_IF status>domoff<TMPL_ELSE>domon</TMPL_IF>"><TMPL_IF status>deactivate<TMPL_ELSE>activate</TMPL_IF></a></td></TMPL_IF>
+<TMPL_IF domain_delete>	<td align="center"><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_IF domlist>deldom<TMPL_ELSE>delrevzone</TMPL_IF>&amp;id=<TMPL_VAR NAME=domain_id>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td></TMPL_IF>
 </tr>
 </TMPL_LOOP>
+<tr><td colspan="5" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
 <TMPL_ELSE>
 <tr><td colspan="5" align="center">No <TMPL_IF domlist>domains<TMPL_ELSE>reverse zones</TMPL_IF> found</td></tr>
Index: branches/stable/templates/edgroup.tmpl
===================================================================
--- branches/stable/templates/edgroup.tmpl	(revision 547)
+++ branches/stable/templates/edgroup.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -5,7 +4,6 @@
 <td align="center" valign="top">
 
-<form action="dns.cgi" method="post">
+<form action="<TMPL_VAR NAME=script_self>" method="post">
 <fieldset>
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="edgroup" />
 <input type="hidden" name="grpaction" value="updperms" />
Index: branches/stable/templates/editsoa.tmpl
===================================================================
--- branches/stable/templates/editsoa.tmpl	(revision 547)
+++ branches/stable/templates/editsoa.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -11,7 +10,6 @@
 <div id="tableholder">
 
-<form action="dns.cgi" method="post">
+<form action="<TMPL_VAR NAME=script_self>" method="post">
 <fieldset>
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="updatesoa" />
 <input type="hidden" name="id" value="<TMPL_VAR NAME=id>" />
Index: branches/stable/templates/footer.tmpl
===================================================================
--- branches/stable/templates/footer.tmpl	(revision 547)
+++ branches/stable/templates/footer.tmpl	(revision 548)
@@ -5,5 +5,5 @@
 <div id="contact">
 <a href="https://secure.deepnet.cx/trac/dnsadmin">dnsadmin</a> <TMPL_VAR NAME=version>
-&copy; 2008-2012 <a href="mailto:kdeugau@deepnet.cx">Kris Deugau</a>/<a href="http://www.deepnet.cx">deepnet</a><br />
+&copy; 2008-2013 <a href="mailto:kdeugau@deepnet.cx">Kris Deugau</a>/<a href="http://www.deepnet.cx">deepnet</a><br />
 Written for standards-based browsers (eg <a href="http://www.firefox.com">FireFox</a>/<a href="http://www.mozilla.org">Mozilla</a>)
 </div>
Index: branches/stable/templates/fpnla.tmpl
===================================================================
--- branches/stable/templates/fpnla.tmpl	(revision 547)
+++ branches/stable/templates/fpnla.tmpl	(revision 548)
@@ -1,5 +1,5 @@
-<TMPL_IF navfirst><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=0<TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>"><img src="images/frev.png" alt="[ First ]" />First</a><TMPL_ELSE><img src="images/frev.png" alt="[ First ]" />First</TMPL_IF>&nbsp;
-<TMPL_IF navprev><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=prevoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>"><img src="images/rev.png" alt="[ Previous ]" />Previous</a><TMPL_ELSE><img src="images/rev.png" alt="[ Previous ]" />Previous</TMPL_IF>&nbsp;
-<TMPL_IF navnext><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=nextoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>">Next<img src="images/fwd.png" alt="[ Next ]" /></a><TMPL_ELSE>Next<img src="images/fwd.png" alt="[ Next ]" /></TMPL_IF>&nbsp;
-<TMPL_IF navlast><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=lastoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>">Last<img src="images/ffwd.png" alt="[ Last ]" /></a><TMPL_ELSE>Last<img src="images/ffwd.png" alt="[ Last ]" /></TMPL_IF>&nbsp;
-<TMPL_IF navall><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=all<TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>">All</a><TMPL_ELSE><TMPL_UNLESS onepage><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=0<TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VARNAME=revrec></TMPL_IF>"><TMPL_VAR NAME=perpage> per page</a></TMPL_UNLESS></TMPL_IF>
+<TMPL_IF navfirst><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=0<TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>"><img src="images/frev.png" alt="[ First ]" />First</a><TMPL_ELSE><img src="images/frev.png" alt="[ First ]" />First</TMPL_IF>&nbsp;
+<TMPL_IF navprev><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=prevoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>"><img src="images/rev.png" alt="[ Previous ]" />Previous</a><TMPL_ELSE><img src="images/rev.png" alt="[ Previous ]" />Previous</TMPL_IF>&nbsp;
+<TMPL_IF navnext><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=nextoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>">Next<img src="images/fwd.png" alt="[ Next ]" /></a><TMPL_ELSE>Next<img src="images/fwd.png" alt="[ Next ]" /></TMPL_IF>&nbsp;
+<TMPL_IF navlast><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=lastoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>">Last<img src="images/ffwd.png" alt="[ Last ]" /></a><TMPL_ELSE>Last<img src="images/ffwd.png" alt="[ Last ]" /></TMPL_IF>&nbsp;
+<TMPL_IF navall><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=all<TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VAR NAME=revrec></TMPL_IF>">All</a><TMPL_ELSE><TMPL_UNLESS onepage><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=0<TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF><TMPL_IF revrec>&amp;revrec=<TMPL_VARNAME=revrec></TMPL_IF>"><TMPL_VAR NAME=perpage> per page</a></TMPL_UNLESS></TMPL_IF>
Index: branches/stable/templates/grpman.tmpl
===================================================================
--- branches/stable/templates/grpman.tmpl	(revision 547)
+++ branches/stable/templates/grpman.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -16,6 +15,6 @@
 <tr><td colspan="3" align="center"><TMPL_INCLUDE NAME="lettsearch.tmpl"></td></tr>
 <tr>
-	<td colspan="2"><TMPL_IF edgrp><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=edgroup&amp;gid=<TMPL_VAR NAME=gid>">Edit Current Group</a></TMPL_IF></td>
-	<td align="right"><TMPL_IF addgrp><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=newgrp">New Group</a></TMPL_IF>
+	<td colspan="2"><TMPL_IF edgrp><a href="<TMPL_VAR NAME=script_self>&amp;page=edgroup&amp;gid=<TMPL_VAR NAME=gid>">Edit Current Group</a></TMPL_IF></td>
+	<td align="right"><TMPL_IF addgrp><a href="<TMPL_VAR NAME=script_self>&amp;page=newgrp">New Group</a></TMPL_IF>
 </td>
 </tr>
@@ -24,6 +23,6 @@
 <table width="98%" border="0" cellspacing="4" cellpadding="3">
 <tr>
-<TMPL_LOOP NAME=colheads>	<td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="dns.cgi?sid=<TMPL_VAR
- NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
+<TMPL_LOOP NAME=colheads>	<td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="<TMPL_VAR
+ NAME=script_self>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
  NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR NAME=sortby>&amp;order=<TMPL_VAR NAME=order>"><TMPL_VAR
  NAME=colname></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>" src="images/<TMPL_VAR
@@ -37,5 +36,5 @@
 <TMPL_LOOP name=grouptable>
 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
-	<td align="left"><TMPL_IF edgrp><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=edgroup&amp;gid=<TMPL_VAR NAME=groupid>"><TMPL_VAR NAME=groupname></a><TMPL_ELSE><TMPL_VAR NAME=groupname></TMPL_IF></td>
+	<td align="left"><TMPL_IF edgrp><a href="<TMPL_VAR NAME=script_self>&amp;page=edgroup&amp;gid=<TMPL_VAR NAME=groupid>"><TMPL_VAR NAME=groupname></a><TMPL_ELSE><TMPL_VAR NAME=groupname></TMPL_IF></td>
 	<td><TMPL_VAR name=pgroup></td>
 	<td><TMPL_VAR name=nusers></td>
@@ -43,10 +42,11 @@
 	<td><TMPL_VAR NAME=nrevzones></td>
 <TMPL_IF delgrp>
-	<td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delgrp&amp;id=<TMPL_VAR NAME=groupid>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
+	<td align="center"><a href="<TMPL_VAR NAME=script_self>&amp;page=delgrp&amp;id=<TMPL_VAR NAME=groupid>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
 </TMPL_IF>
 </tr>
 </TMPL_LOOP>
+<tr><td colspan="6" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
 <TMPL_ELSE>
-<tr><td colspan="5" align="center">No groups found</td></tr>
+<tr><td colspan="6" align="center">No groups found</td></tr>
 </TMPL_IF>
 </table>
Index: branches/stable/templates/header.tmpl
===================================================================
--- branches/stable/templates/header.tmpl	(revision 547)
+++ branches/stable/templates/header.tmpl	(revision 548)
@@ -21,4 +21,7 @@
         <link rel="stylesheet" type="text/css" href="templates/grouptree.css" />
         <!-- [endif] -->
+
+	<!-- Custom local stylesheet, if desired -->
+	<link rel="stylesheet" type="text/css" href="local.css" />
     </head>
 <body>
Index: branches/stable/templates/location.tmpl
===================================================================
--- branches/stable/templates/location.tmpl	(revision 547)
+++ branches/stable/templates/location.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -9,9 +8,8 @@
 <TMPL_ELSE>
 
-<form action="dns.cgi" method="post">
+<form action="<TMPL_VAR NAME=script_self>" method="post">
 <fieldset>
 
 <input type="hidden" name="page" value="location" />
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <TMPL_IF id><input type="hidden" name="id" value="<TMPL_VAR NAME=id>" /></TMPL_IF>
 <input type="hidden" name="locact" value="<TMPL_VAR NAME=locact>" />
Index: branches/stable/templates/loclist.tmpl
===================================================================
--- branches/stable/templates/loclist.tmpl	(revision 547)
+++ branches/stable/templates/loclist.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -15,5 +14,5 @@
 </tr>
 <TMPL_IF addloc>
-<tr><td colspan="3" align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=location">New Location/View</a></td></tr>
+<tr><td colspan="3" align="right"><a href="<TMPL_VAR NAME=script_self>&amp;page=location">New Location/View</a></td></tr>
 </TMPL_IF>
 </table>
@@ -21,6 +20,6 @@
 <table width="98%" border="0" cellspacing="4" cellpadding="3" class="csubtable">
 <tr>
-<TMPL_LOOP NAME=colheads>	<td class="datahead_s"><a href="dns.cgi?sid=<TMPL_VAR
- NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
+<TMPL_LOOP NAME=colheads>	<td class="datahead_s"><a href="<TMPL_VAR
+ NAME=script_self>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
  NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR NAME=sortby>&amp;order=<TMPL_VAR NAME=order>"><TMPL_VAR
  NAME=colname></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>" src="images/<TMPL_VAR
@@ -32,9 +31,9 @@
 <TMPL_LOOP name=loctable>
 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
-	<td align="left"><TMPL_IF edloc><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=location&amp;locact=edit&amp;loc=<TMPL_VAR NAME=location>"><TMPL_VAR NAME=description></a><TMPL_ELSE><TMPL_VAR NAME=description></TMPL_IF></td>
+	<td align="left"><TMPL_IF edloc><a href="<TMPL_VAR NAME=script_self>&amp;page=location&amp;locact=edit&amp;loc=<TMPL_VAR NAME=location>"><TMPL_VAR NAME=description></a><TMPL_ELSE><TMPL_VAR NAME=description></TMPL_IF></td>
 	<td><TMPL_VAR name=iplist></td>
 	<td><TMPL_VAR name=group_name></td>
 <TMPL_IF delloc>
-	<td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delloc&amp;locid=<TMPL_VAR 
+	<td align="center"><a href="<TMPL_VAR NAME=script_self>&amp;page=delloc&amp;locid=<TMPL_VAR 
 NAME=location>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
 </TMPL_IF>
Index: branches/stable/templates/log.tmpl
===================================================================
--- branches/stable/templates/log.tmpl	(revision 547)
+++ branches/stable/templates/log.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -21,5 +20,5 @@
       <!-- td>Customer ID</td -->
 <tr class="darkrowheader">
-<TMPL_LOOP NAME=colheads>	<td><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF
+<TMPL_LOOP NAME=colheads>	<td><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=page><TMPL_IF
  NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR
  NAME=sortby>&amp;order=<TMPL_VAR NAME=order>&amp;id=<TMPL_VAR NAME=id>&amp;ltype=<TMPL_VAR
@@ -40,4 +39,5 @@
     </tr>
 </TMPL_LOOP>
+    <tr><td colspan="5" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
 <TMPL_ELSE>
     <tr class="datalinelight">
Index: branches/stable/templates/login.tmpl
===================================================================
--- branches/stable/templates/login.tmpl	(revision 547)
+++ branches/stable/templates/login.tmpl	(revision 548)
@@ -1,6 +1,7 @@
-<form method="post" action="dns.cgi">
+<form method="post" action="<TMPL_VAR NAME=script_self>">
 <fieldset>
 <input type="hidden" name="action" value="login" />
 <input type="hidden" name="page" value="login" />
+<input type="hidden" name="target" value="<TMPL_VAR NAME=target>" />
 
 <div id="login">
Index: branches/stable/templates/menu.tmpl
===================================================================
--- branches/stable/templates/menu.tmpl	(revision 547)
+++ branches/stable/templates/menu.tmpl	(revision 548)
@@ -1,17 +1,17 @@
 <td class="menu">
 <TMPL_VAR NAME=username> logged in<br />
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;action=logout">Log out</a>
+<a href="<TMPL_VAR NAME=script_self>&amp;action=logout">Log out</a>
 <hr />
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist">Domains</a><br />
-<TMPL_IF mayrdns><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=revzones">Reverse Zones</a><br /></TMPL_IF>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=useradmin">Users</a><br />
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=log">Log</a><br />
-<TMPL_IF maydefrec><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=group>&amp;defrec=y">Default Records</a><br />
-<TMPL_IF mayrdns><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=group>&amp;defrec=y&amp;revrec=y">Default Reverse Records</a><br /></TMPL_IF></TMPL_IF>
-<TMPL_IF mayloc><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=loclist&amp;id=<TMPL_VAR NAME=group>">Locations/Views</a><br /></TMPL_IF>
-<TMPL_IF mayimport><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=axfr">AXFR Import</a><br /></TMPL_IF>
-<TMPL_IF maybulk><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=bulkdomain">Bulk Domain Operations</a><br /></TMPL_IF>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=domlist">Domains</a><br />
+<TMPL_IF mayrdns><a href="<TMPL_VAR NAME=script_self>&amp;page=revzones">Reverse Zones</a><br /></TMPL_IF>
+<a href="<TMPL_VAR NAME=script_self>&amp;page=useradmin">Users</a><br />
+<a href="<TMPL_VAR NAME=script_self>&amp;page=log">Log</a><br />
+<TMPL_IF maydefrec><a href="<TMPL_VAR NAME=script_self>&amp;page=reclist&amp;id=<TMPL_VAR NAME=group>&amp;defrec=y">Default Records</a><br />
+<TMPL_IF mayrdns><a href="<TMPL_VAR NAME=script_self>&amp;page=reclist&amp;id=<TMPL_VAR NAME=group>&amp;defrec=y&amp;revrec=y">Default Reverse Records</a><br /></TMPL_IF></TMPL_IF>
+<TMPL_IF mayloc><a href="<TMPL_VAR NAME=script_self>&amp;page=loclist&amp;id=<TMPL_VAR NAME=group>">Locations/Views</a><br /></TMPL_IF>
+<TMPL_IF mayimport><a href="<TMPL_VAR NAME=script_self>&amp;page=axfr">AXFR Import</a><br /></TMPL_IF>
+<TMPL_IF maybulk><a href="<TMPL_VAR NAME=script_self>&amp;page=bulkdomain">Bulk Domain Operations</a><br /></TMPL_IF>
 <br />
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=grpman"><TMPL_IF chggrps>Manage<TMPL_ELSE>View</TMPL_IF> groups</a><br />
+<a href="<TMPL_VAR NAME=script_self>&amp;page=grpman"><TMPL_IF chggrps>Manage<TMPL_ELSE>View</TMPL_IF> groups</a><br />
 <hr />
 <div id="grptree">
@@ -30,5 +30,6 @@
 <!-- hmm:  <TMPL_VAR NAME=groupname> -->
 <hr />
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=dnsq">DNS Query</a><br />
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=whoisq">WHOIS Query</a><br />
+<a href="<TMPL_VAR NAME=script_self>&amp;page=dnsq">DNS Query</a><br />
+<a href="<TMPL_VAR NAME=script_self>&amp;page=whoisq">WHOIS Query</a><br />
+
 </td>
Index: branches/stable/templates/newdomain.tmpl
===================================================================
--- branches/stable/templates/newdomain.tmpl	(revision 547)
+++ branches/stable/templates/newdomain.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -5,8 +4,7 @@
 <td align="center" valign="top">
 
-<form action="dns.cgi">
+<form action="<TMPL_VAR NAME=script_self>">
 <fieldset>
 
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="adddomain" />
 <input type="hidden" name="newdomain" value="yes" />
@@ -34,5 +32,5 @@
 <TMPL_IF location_view><TMPL_IF record_locchg>
 	<tr class="datalinelight">
-		<td>Default location/view:</td>
+		<td>Location/view:</td>
 		<td><select name="defloc">
 <TMPL_LOOP name=loclist>		<option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected="selected"</TMPL_IF>><TMPL_VAR NAME=locname></option>
Index: branches/stable/templates/newgrp.tmpl
===================================================================
--- branches/stable/templates/newgrp.tmpl	(revision 547)
+++ branches/stable/templates/newgrp.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -5,8 +4,7 @@
 <td align="center" valign="top">
 
-<form action="dns.cgi">
+<form action="<TMPL_VAR NAME=script_self>">
 <fieldset>
 
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="newgrp" />
 <input type="hidden" name="grpaction" value="add" />
Index: branches/stable/templates/newrevzone.tmpl
===================================================================
--- branches/stable/templates/newrevzone.tmpl	(revision 547)
+++ branches/stable/templates/newrevzone.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -5,8 +4,7 @@
 <td align="center" valign="top">
 
-<form action="dns.cgi">
+<form action="<TMPL_VAR NAME=script_self>">
 <fieldset>
 
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="addrevzone" />
 <input type="hidden" name="newrevzone" value="yes" />
@@ -28,14 +26,4 @@
 	</tr>
 	<tr class="datalinelight">
-		<td>Default location/view:</td>
-		<td align="left">
-			<select name="location">
-			<TMPL_LOOP loclist>
-			<option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected</TMPL_IF>><TMPL_VAR NAME=locname></option>
-			</TMPL_LOOP>
-			</select>
-		</td>
-	</tr>
-	<tr class="datalinelight">
 		<td>Add reverse zone to group:</td>
 		<td><select name="group">
@@ -47,4 +35,16 @@
 		<td>Make reverse zone active on next DNS propagation</td><td><input type="checkbox" name="makeactive" checked="checked" /></td>
 	</tr>
+<TMPL_IF location_view><TMPL_IF record_locchg>
+	<tr class="datalinelight">
+		<td>Location/view:</td>
+		<td align="left">
+			<select name="location">
+			<TMPL_LOOP loclist>
+			<option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected="selected"</TMPL_IF>><TMPL_VAR NAME=locname></option>
+			</TMPL_LOOP>
+			</select>
+		</td>
+	</tr>
+</TMPL_IF></TMPL_IF>
 	<tr><td colspan="2" class="tblsubmit"><input type="submit" value="Add reverse zone" /></td></tr>
     </table>
Index: branches/stable/templates/permlist_enabled.tmpl
===================================================================
--- branches/stable/templates/permlist_enabled.tmpl	(revision 547)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<TMPL_IF bobsyeruncle>
-fixme: This chunk of form *should* be more reusable than it is currently - it's
- duplicated into newuser.tmpl with some slight mods.
-</TMPL_IF>
-<tr>
-	<td align="right">Group:</td>
-	<td><input type="checkbox"<TMPL_IF i_grped> checked="checked"</TMPL_IF> /> Edit</td>
-	<td><input type="checkbox"<TMPL_IF i_grpcreate> checked="checked"</TMPL_IF> /> Create</td>
-	<td><input type="checkbox"<TMPL_IF i_grpdel> checked="checked"</TMPL_IF> /> Delete</td>
-</tr>
-<tr>
-	<td align="right">User:</td>
-	<td><input type="checkbox"<TMPL_IF i_usered> checked="checked"</TMPL_IF> /> Edit</td>
-	<td><input type="checkbox"<TMPL_IF i_usercreate> checked="checked"</TMPL_IF> /> Create</td>
-	<td><input type="checkbox"<TMPL_IF i_userdel> checked="checked"</TMPL_IF> /> Delete</td>
-</tr>
-<tr>
-	<td align="right">Domain:</td>
-	<td><input type="checkbox"<TMPL_IF i_domed> checked="checked"</TMPL_IF> /> Edit</td>
-	<td><input type="checkbox"<TMPL_IF i_domcreate> checked="checked"</TMPL_IF> /> Create</td>
-	<td><input type="checkbox"<TMPL_IF i_domdel> checked="checked"</TMPL_IF> /> Delete</td>
-	<!-- td>+ Delegate</td -->
-</tr>
-<tr>
-	<td align="right">Domain Record:</td>
-	<td><input type="checkbox"<TMPL_IF i_reced> checked="checked"</TMPL_IF> /> Edit</td>
-	<td><input type="checkbox"<TMPL_IF i_reccreate> checked="checked"</TMPL_IF> /> Create</td>
-	<td><input type="checkbox"<TMPL_IF i_recdel> checked="checked"</TMPL_IF> /> Delete</td>
-	<!-- td>+ Delegate</td -->
-</tr>
-<tr>
-	<td align="right">Self:</td>
-	<td><input type="checkbox"<TMPL_IF i_edself> checked="checked"</TMPL_IF> /> Edit</td>
-</tr>
Index: branches/stable/templates/reclist.tmpl
===================================================================
--- branches/stable/templates/reclist.tmpl	(revision 547)
+++ branches/stable/templates/reclist.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -25,7 +24,6 @@
 	</td>
 	<td colspan="2" align="right">
-		<form action="dns.cgi">
+		<form action="<TMPL_VAR NAME=script_self>">
 		<fieldset>
-		<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 		<input type="hidden" name="page" value="reclist" />
 		<input type="hidden" name="offset" value="0" />
@@ -41,7 +39,7 @@
 <tr class="darkrowheader">
 	<td colspan="3">Records</td>
-	<td align="center"><a href="textrecs.cgi?sid=<TMPL_VAR NAME=sid>&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>">Plain text</a></td>
-<TMPL_IF record_create>	<td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=record&amp;parentid=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;recact=new">Add record</a></td></TMPL_IF>
-	<td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=log&amp;id=<TMPL_VAR NAME=id><TMPL_IF logdom>&amp;ltype=dom</TMPL_IF><TMPL_IF logrdns>&amp;ltype=rdns</TMPL_IF>">View log</a></td>
+	<td align="center"><a href="textrecs.cgi?id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>">Plain text</a></td>
+<TMPL_IF record_create>	<td align="right"><a href="<TMPL_VAR NAME=script_self>&amp;page=record&amp;parentid=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;recact=new">Add record</a></td></TMPL_IF>
+	<td align="right"><a href="<TMPL_VAR NAME=script_self>&amp;page=log&amp;id=<TMPL_VAR NAME=id><TMPL_IF logdom>&amp;ltype=dom</TMPL_IF><TMPL_IF logrdns>&amp;ltype=rdns</TMPL_IF>">View log</a></td>
 </tr>
 
@@ -51,5 +49,5 @@
 <TMPL_IF reclist>
 <tr class="darkrowheader">
-<TMPL_LOOP NAME=colheads>	<td><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF
+<TMPL_LOOP NAME=colheads>	<td><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=page><TMPL_IF
  NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR
  NAME=sortby>&amp;order=<TMPL_VAR NAME=order>&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR
@@ -63,5 +61,10 @@
 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
 <TMPL_IF fwdzone>
-	<td><TMPL_IF record_edit><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=record&amp;parentid=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;recact=edit&amp;id=<TMPL_VAR NAME=record_id>"><TMPL_VAR NAME=host></a><TMPL_IF locname> (<TMPL_VAR NAME=locname>)</TMPL_IF><TMPL_ELSE><TMPL_VAR NAME=host><TMPL_IF locname> (<TMPL_VAR NAME=locname>)</TMPL_IF></TMPL_IF></td>
+	<td><TMPL_IF record_edit><a href="<TMPL_VAR NAME=script_self>&amp;page=record&amp;parentid=<TMPL_VAR
+ NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;recact=edit&amp;id=<TMPL_VAR
+ NAME=record_id>"><TMPL_VAR NAME=host></a><TMPL_IF locname> (<TMPL_VAR
+ NAME=locname>)</TMPL_IF><TMPL_ELSE><TMPL_VAR NAME=host><TMPL_IF locname> (<TMPL_VAR
+ NAME=locname>)</TMPL_IF></TMPL_IF><TMPL_IF stampactive><br />(<TMPL_VAR NAME=stamptype> <TMPL_VAR
+ NAME=stamp>)</TMPL_IF></td>
 	<td><TMPL_VAR NAME=type></td>
 	<td><TMPL_VAR NAME=val></td>
@@ -70,14 +73,20 @@
 	<td><TMPL_VAR NAME=port></td>
 <TMPL_ELSE>
-	<td><TMPL_IF record_edit><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=record&amp;parentid=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;recact=edit&amp;id=<TMPL_VAR NAME=record_id>"><TMPL_VAR NAME=val></a><TMPL_IF locname> (<TMPL_VAR NAME=locname>)</TMPL_IF><TMPL_ELSE><TMPL_VAR NAME=val><TMPL_IF locname> (<TMPL_VAR NAME=locname>)</TMPL_IF></TMPL_IF></td>
+	<td><TMPL_IF record_edit><a href="<TMPL_VAR NAME=script_self>&amp;page=record&amp;parentid=<TMPL_VAR
+ NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;recact=edit&amp;id=<TMPL_VAR
+ NAME=record_id>"><TMPL_VAR NAME=val></a><TMPL_IF locname> (<TMPL_VAR
+ NAME=locname>)</TMPL_IF><TMPL_ELSE><TMPL_VAR NAME=val><TMPL_IF locname> (<TMPL_VAR
+ NAME=locname>)</TMPL_IF></TMPL_IF><TMPL_IF stampactive><br />(<TMPL_VAR NAME=stamptype> <TMPL_VAR
+ NAME=stamp>)</TMPL_IF></td>
 	<td><TMPL_VAR NAME=type></td>
 	<td><TMPL_VAR NAME=host></td>
 </TMPL_IF>
 	<td><TMPL_VAR NAME=ttl></td>
-<TMPL_IF record_delete>	<td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrec&amp;id=<TMPL_VAR NAME=record_id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;parentid=<TMPL_VAR NAME=id>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td></TMPL_IF>
+<TMPL_IF record_delete>	<td align="center"><a href="<TMPL_VAR NAME=script_self>&amp;page=delrec&amp;id=<TMPL_VAR NAME=record_id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;parentid=<TMPL_VAR NAME=id>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td></TMPL_IF>
 </tr>
 </TMPL_LOOP>
+<tr class="darkrowheader"><td colspan="8" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
 <TMPL_ELSE>
-<tr><td colspan="5">No records found</td></tr>
+<tr><td colspan="8" align="center">No records found</td></tr>
 </TMPL_IF>
 </table>
Index: branches/stable/templates/record.tmpl
===================================================================
--- branches/stable/templates/record.tmpl	(revision 547)
+++ branches/stable/templates/record.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -9,5 +8,5 @@
 <TMPL_ELSE>
 
-<form action="dns.cgi" method="post">
+<form action="<TMPL_VAR NAME=script_self>" method="post">
 <fieldset>
 
@@ -15,10 +14,9 @@
 <input type="hidden" name="defrec" value="<TMPL_VAR NAME=defrec>" />
 <input type="hidden" name="revrec" value="<TMPL_VAR NAME=revrec>" />
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="parentid" value="<TMPL_VAR NAME=parentid>" />
 <input type="hidden" name="id" value="<TMPL_VAR NAME=id>" />
 <input type="hidden" name="recact" value="<TMPL_VAR NAME=recact>" />
 
-<table class="container" width="450">
+<table class="container" width="520">
 <tr><td>
 
@@ -29,5 +27,5 @@
 <TMPL_IF fwdzone>
 		<td>Hostname</td>
-		<td><input type="text" name="name" value="<TMPL_VAR NAME=name>" size="30" /></td>
+		<td><input type="text" name="name" value="<TMPL_VAR NAME=name>" size="30" />&nbsp; &nbsp; <a href="reverse-patterns.html">?</a></td>
 <TMPL_ELSE>
 		<td>IP Address</td>
@@ -49,5 +47,5 @@
 <TMPL_ELSE>
 		<td>Hostname</td>
-		<td><input type="text" name="name" value="<TMPL_VAR NAME=name>" size="30" /></td>
+		<td><input type="text" name="name" value="<TMPL_VAR NAME=name>" size="30" />&nbsp; &nbsp; <a href="reverse-patterns.html">?</a></td>
 </TMPL_IF>
 	</tr>
@@ -83,4 +81,13 @@
 	</tr>
 </TMPL_IF>
+<TMPL_UNLESS is_default>
+	<tr class="datalinelight">
+		<td>Timestamp<br />(blank or 0 disables timestamp)</td>
+		<td>Valid <input type="radio" name="expires" value="until"<TMPL_IF stamp_until> checked="checked"</TMPL_IF>>until
+		<input type="radio" name="expires" value="after"<TMPL_UNLESS stamp_until> checked="checked"</TMPL_UNLESS>>after:
+		<input type="text" name="stamp" value="<TMPL_VAR NAME=stamp>" />
+		</td>
+	</tr>
+</TMPL_UNLESS>
 	<tr class="datalinelight">
 		<td colspan="2" align="center"><input type="submit" value=" <TMPL_VAR NAME=todo> " /></td>
Index: branches/stable/templates/soadata.tmpl
===================================================================
--- branches/stable/templates/soadata.tmpl	(revision 547)
+++ branches/stable/templates/soadata.tmpl	(revision 548)
@@ -3,5 +3,5 @@
         <td align="left">SOA:</td>
 <TMPL_IF mayeditsoa>
-        <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=editsoa&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>">edit</a></td></TMPL_IF>
+        <td align="right"><a href="<TMPL_VAR NAME=script_self>&amp;page=editsoa&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>">edit</a></td></TMPL_IF>
 </tr>
 </table>
Index: branches/stable/templates/template.tmpl
===================================================================
--- branches/stable/templates/template.tmpl	(revision 547)
+++ branches/stable/templates/template.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
Index: branches/stable/templates/user.tmpl
===================================================================
--- branches/stable/templates/user.tmpl	(revision 547)
+++ branches/stable/templates/user.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -5,8 +4,7 @@
 <td align="center" valign="top">
 
-<form action="dns.cgi" method="post">
+<form action="<TMPL_VAR NAME=script_self>" method="post">
 <fieldset>
 
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="user" />
 <input type="hidden" name="useraction" value="<TMPL_VAR NAME=action>" />
Index: branches/stable/templates/useradmin.tmpl
===================================================================
--- branches/stable/templates/useradmin.tmpl	(revision 547)
+++ branches/stable/templates/useradmin.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -16,5 +15,5 @@
 <tr><td colspan="3" align="center"><TMPL_INCLUDE NAME="lettsearch.tmpl"></td></tr>
 <TMPL_IF adduser>
-<tr><td colspan="3" align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=user">New User</a></td></tr>
+<tr><td colspan="3" align="right"><a href="<TMPL_VAR NAME=script_self>&amp;page=user">New User</a></td></tr>
 </TMPL_IF>
 </table>
@@ -22,6 +21,6 @@
 <table width="98%" border="0" cellspacing="4" cellpadding="3" class="csubtable">
 <tr>
-<TMPL_LOOP NAME=colheads>	<td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="dns.cgi?sid=<TMPL_VAR
- NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
+<TMPL_LOOP NAME=colheads>	<td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="<TMPL_VAR
+ NAME=script_self>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
  NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR NAME=sortby>&amp;order=<TMPL_VAR NAME=order>"><TMPL_VAR
  NAME=colname></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>" src="images/<TMPL_VAR
@@ -33,5 +32,5 @@
 <TMPL_LOOP name=usertable>
 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
-	<td align="left"><TMPL_IF eduser><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=user&amp;useraction=edit&amp;user=<TMPL_VAR NAME=user_id>"><TMPL_VAR NAME=username></a><TMPL_ELSE><TMPL_VAR NAME=username></TMPL_IF></td>
+	<td align="left"><TMPL_IF eduser><a href="<TMPL_VAR NAME=script_self>&amp;page=user&amp;useraction=edit&amp;user=<TMPL_VAR NAME=user_id>"><TMPL_VAR NAME=username></a><TMPL_ELSE><TMPL_VAR NAME=username></TMPL_IF></td>
 	<td class="data_nowrap"><TMPL_VAR name=fname></td>
 	<td><TMPL_VAR name=type></td>
@@ -39,5 +38,5 @@
 	<td align="center">
 <TMPL_IF eduser>
-		<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=useradmin<TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=user_id>&amp;userstatus=<TMPL_IF status>useroff<TMPL_ELSE>useron</TMPL_IF>"><TMPL_IF status>enabled<TMPL_ELSE>disabled</TMPL_IF></a>
+		<a href="<TMPL_VAR NAME=script_self>&amp;page=useradmin<TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=user_id>&amp;userstatus=<TMPL_IF status>useroff<TMPL_ELSE>useron</TMPL_IF>"><TMPL_IF status>enabled<TMPL_ELSE>disabled</TMPL_IF></a>
 <TMPL_ELSE>
 		<TMPL_IF status>enabled<TMPL_ELSE>disabled</TMPL_IF>
@@ -45,10 +44,11 @@
 </td>
 <TMPL_IF deluser>
-	<td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;id=<TMPL_VAR NAME=user_id>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
+	<td align="center"><a href="<TMPL_VAR NAME=script_self>&amp;page=deluser&amp;id=<TMPL_VAR NAME=user_id>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
 </TMPL_IF>
 </tr>
 </TMPL_LOOP>
+<tr><td colspan="6" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
 <TMPL_ELSE>
-<tr><td colspan="6">No users found</td></tr>
+<tr><td colspan="6" align="center">No users found</td></tr>
 </TMPL_IF>
 </table>
Index: branches/stable/templates/whoisq.tmpl
===================================================================
--- branches/stable/templates/whoisq.tmpl	(revision 547)
+++ branches/stable/templates/whoisq.tmpl	(revision 548)
@@ -1,3 +1,2 @@
-<!-- <TMPL_VAR NAME=sid> -->
 <table class="wholepage"><tr>
 <TMPL_INCLUDE NAME="menu.tmpl">
@@ -7,7 +6,6 @@
 <TMPL_IF errmsg><div class="errmsg">Query error: <TMPL_VARNAME=errmsg></div></TMPL_IF>
 
-<form action="dns.cgi" method="post">
+<form action="<TMPL_VAR NAME=script_self>" method="post">
 <fieldset>
-<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="whoisq" />
 <input type="hidden" name="askaway" value="y" />
