Index: branches/htmlform/Makefile
===================================================================
--- branches/htmlform/Makefile	(revision 504)
+++ branches/htmlform/Makefile	(revision 505)
@@ -41,5 +41,5 @@
 	cgi-bin/main.cgi cgi-bin/checkcusts.pl cgi-bin/newcity.cgi \
 	cgi-bin/allocate.pl cgi-bin/search.cgi \
-	cgi-bin/snCalc.cgi cgi-bin/CommonWeb.pm cgi-bin/ipdb.psql \
+	cgi-bin/snCalc.cgi cgi-bin/ipdb.psql \
 	cgi-bin/consistency-check.pl \
 	\
Index: branches/htmlform/cgi-bin/CommonWeb.pm
===================================================================
--- branches/htmlform/cgi-bin/CommonWeb.pm	(revision 504)
+++ 	(revision )
@@ -1,37 +1,0 @@
-# ipdb/cgi-bin/CommonWeb.pm
-###
-# SVN revision info
-# $Date$
-# SVN revision $Rev$
-# Last update by $Author$
-###
-
-package CommonWeb;
-
-use strict;		
-use warnings;
-use Exporter;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
-$VERSION     = 1.00;
-@ISA         = qw(Exporter);
-@EXPORT_OK      = qw( &printError );
-
-@EXPORT      = (); #export nothing by default
-%EXPORT_TAGS = ( ALL => [qw( &printError )],
-                 lean    => [qw( &printError )]
-		);
-
-
-sub printError($)
-{
-	my $errStr = $_[0];
-	print qq(
-	<center><p class="regular"> $errStr </p>
-	<input type="button" value="Back" onclick="history.go(-1)">
-	</center>
-	);
-}
-
-# indicate that the module loaded okay.
-1;
Index: branches/htmlform/cgi-bin/admin.cgi
===================================================================
--- branches/htmlform/cgi-bin/admin.cgi	(revision 504)
+++ branches/htmlform/cgi-bin/admin.cgi	(revision 505)
@@ -18,5 +18,4 @@
 use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
 use CustIDCK;
 #use POSIX qw(ceil);
Index: branches/htmlform/cgi-bin/allocate.pl
===================================================================
--- branches/htmlform/cgi-bin/allocate.pl	(revision 504)
+++ branches/htmlform/cgi-bin/allocate.pl	(revision 505)
@@ -11,5 +11,4 @@
 use warnings;
 use DBI;
-use CommonWeb qw(:ALL);
 use NetAddr::IP;
 
Index: branches/htmlform/cgi-bin/combineblocks.pl
===================================================================
--- branches/htmlform/cgi-bin/combineblocks.pl	(revision 504)
+++ branches/htmlform/cgi-bin/combineblocks.pl	(revision 505)
@@ -13,5 +13,4 @@
 #use CGI::Carp qw(fatalsToBrowser);
 use DBI;
-#use CommonWeb qw(:ALL);
 #use POSIX qw(ceil);
 use NetAddr::IP;
Index: branches/htmlform/cgi-bin/main.cgi
===================================================================
--- branches/htmlform/cgi-bin/main.cgi	(revision 504)
+++ branches/htmlform/cgi-bin/main.cgi	(revision 505)
@@ -15,5 +15,4 @@
 use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
 use CustIDCK;
 use POSIX qw(ceil);
@@ -1084,8 +1083,7 @@
   if ($@) {
     my $msg = $@;
-    carp "Transaction aborted because $msg";
     eval { $ip_dbh->rollback; };
     syslog "err", "$authuser could not update block/IP '$webvar{block}': '$msg'";
-    printError("Could not update block/IP $webvar{block}: $msg");
+    $page->param(err => "Could not update block/IP $webvar{block}: $msg");
     return;
   }
Index: branches/htmlform/cgi-bin/newcity.cgi
===================================================================
--- branches/htmlform/cgi-bin/newcity.cgi	(revision 504)
+++ branches/htmlform/cgi-bin/newcity.cgi	(revision 505)
@@ -16,5 +16,4 @@
 use HTML::Template;
 use DBI;
-#use CommonWeb qw(:ALL);
 #use POSIX qw(ceil);
 use NetAddr::IP;
Index: branches/htmlform/cgi-bin/newnode.cgi
===================================================================
--- branches/htmlform/cgi-bin/newnode.cgi	(revision 504)
+++ branches/htmlform/cgi-bin/newnode.cgi	(revision 505)
@@ -16,5 +16,4 @@
 use HTML::Template;
 use DBI;
-#use CommonWeb qw(:ALL);
 #use POSIX qw(ceil);
 use NetAddr::IP;
Index: branches/htmlform/cgi-bin/search.cgi
===================================================================
--- branches/htmlform/cgi-bin/search.cgi	(revision 504)
+++ branches/htmlform/cgi-bin/search.cgi	(revision 505)
@@ -17,5 +17,4 @@
 use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
 use POSIX qw(ceil);
 use NetAddr::IP;
Index: branches/htmlform/cgi-bin/snCalc.cgi
===================================================================
--- branches/htmlform/cgi-bin/snCalc.cgi	(revision 504)
+++ branches/htmlform/cgi-bin/snCalc.cgi	(revision 505)
@@ -7,5 +7,4 @@
 use HTML::Template;
 use NetAddr::IP;
-use CommonWeb qw(:ALL);;
 
 #file snCalc.cgi	little subnet calculator app
Index: branches/htmlform/templates/update.tmpl
===================================================================
--- branches/htmlform/templates/update.tmpl	(revision 504)
+++ branches/htmlform/templates/update.tmpl	(revision 505)
@@ -1,2 +1,8 @@
+<TMPL_IF err>
+<div class="regular err">
+<p><TMPL_VAR NAME=err></p>
+<input type="button" value="Back" onclick="history.go(-1)">
+</div>
+<TMPL_ELSE>
 <div class="heading">Allocation info updated:</div>
 
@@ -61,2 +67,3 @@
 <a href="/ip/cgi-bin/main.cgi?action=<TMPL_IF backpool>listpool&amp;pool=<TMPL_ELSE>showrouted&amp;block=</TMPL_IF><TMPL_VAR NAME=backblock>">Back to <TMPL_VAR NAME=backblock></a>
 </div>
+</TMPL_IF>