Changeset 505

Timestamp:

09/27/11 13:41:43 (13 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Clean up final reference to printError(), and remove all references
(commented or otherwise) to CommonWeb.pm. Remove the file itself. See #15.
Tweak block-update template for error handling. See #3.

Location:

branches/htmlform

Files:

• Makefile (modified) (1 diff)
• cgi-bin/CommonWeb.pm (deleted)
• cgi-bin/admin.cgi (modified) (1 diff)
• cgi-bin/allocate.pl (modified) (1 diff)
• cgi-bin/combineblocks.pl (modified) (1 diff)
• cgi-bin/main.cgi (modified) (2 diffs)
• cgi-bin/newcity.cgi (modified) (1 diff)
• cgi-bin/newnode.cgi (modified) (1 diff)
• cgi-bin/search.cgi (modified) (1 diff)
• cgi-bin/snCalc.cgi (modified) (1 diff)
• templates/update.tmpl (modified) (2 diffs)

branches/htmlform/Makefile

@@ -41 +41 @@
         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 \
         \

branches/htmlform/cgi-bin/admin.cgi

@@ -18 +18 @@
 use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
 use CustIDCK;
 #use POSIX qw(ceil);

branches/htmlform/cgi-bin/allocate.pl

@@ -11 +11 @@
 use warnings;
 use DBI;
-use CommonWeb qw(:ALL);
 use NetAddr::IP;
 

branches/htmlform/cgi-bin/combineblocks.pl

@@ -13 +13 @@
 #use CGI::Carp qw(fatalsToBrowser);
 use DBI;
-#use CommonWeb qw(:ALL);
 #use POSIX qw(ceil);
 use NetAddr::IP;

branches/htmlform/cgi-bin/main.cgi

@@ -15 +15 @@
 use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
 use CustIDCK;
 use POSIX qw(ceil);
@@ -1084 +1083 @@
   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;
   }

branches/htmlform/cgi-bin/newcity.cgi

@@ -16 +16 @@
 use HTML::Template;
 use DBI;
-#use CommonWeb qw(:ALL);
 #use POSIX qw(ceil);
 use NetAddr::IP;

branches/htmlform/cgi-bin/newnode.cgi

@@ -16 +16 @@
 use HTML::Template;
 use DBI;
-#use CommonWeb qw(:ALL);
 #use POSIX qw(ceil);
 use NetAddr::IP;

branches/htmlform/cgi-bin/search.cgi

@@ -17 +17 @@
 use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
 use POSIX qw(ceil);
 use NetAddr::IP;

branches/htmlform/cgi-bin/snCalc.cgi

@@ -7 +7 @@
 use HTML::Template;
 use NetAddr::IP;
-use CommonWeb qw(:ALL);;
 
 #file snCalc.cgi        little subnet calculator app

branches/htmlform/templates/update.tmpl

@@ +1 @@
+<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 +67 @@
 <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>