Changeset 505 for branches/htmlform/cgi-bin

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/cgi-bin

Files:

• CommonWeb.pm (deleted)
• admin.cgi (modified) (1 diff)
• allocate.pl (modified) (1 diff)
• combineblocks.pl (modified) (1 diff)
• main.cgi (modified) (2 diffs)
• newcity.cgi (modified) (1 diff)
• newnode.cgi (modified) (1 diff)
• search.cgi (modified) (1 diff)
• snCalc.cgi (modified) (1 diff)

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