Changeset 166 for trunk/cgi-bin/main.cgi

Timestamp:

02/22/05 12:23:36 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Merged bugfixes from /branches/stable r162-165.

NB: r163 did not apply completely cleanly due to differences

in custID checks. This is NOT critical as the devel tree
has had BGW crosslink code deliberately left out.

File:

• trunk/cgi-bin/main.cgi (modified) (5 diffs)

trunk/cgi-bin/main.cgi

@@ -799 +799 @@
     if ($base =~ /^[ds]$/) {
       $sql = "select * from poolips where available='y' and".
-        " ptype='$base' and (city='Sudbury' or city='North Bay')";
+        " type='$webvar{alloctype}' and (city='Sudbury' or city='North Bay')";
     } else {
       $sql = "select * from poolips where available='y' and".
-        " ptype='$base' and city='$webvar{pop}'";
+        " type='$webvar{alloctype}' and city='$webvar{pop}'";
     }
 
@@ -1040 +1040 @@
   # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
   if ($webvar{block} =~ /\/32$/) {
-    $sql = "select ip,custid,ptype,city,circuitid,description,notes from poolips where ip='$webvar{block}'";
+    $sql = "select ip,custid,type,city,circuitid,description,notes from poolips where ip='$webvar{block}'";
   } else {
     $sql = "select cidr,custid,type,city,circuitid,description,notes from allocations where cidr='$webvar{block}'"
@@ -1134 +1134 @@
   };
   if ($@) {
-    carp "Transaction aborted because $@";
+    my $msg = $@;
+    carp "Transaction aborted because $msg";
     eval { $ip_dbh->rollback; };
-    syslog "err", "$authuser could not update block/IP '$webvar{block}': '$@'";
-    printError("Could not update block/IP $webvar{block}: $@");
+    syslog "err", "$authuser could not update block/IP '$webvar{block}': '$msg'";
+    printError("Could not update block/IP $webvar{block}: $msg");
     return;
   }
@@ -1209 +1210 @@
 
     # Unassigning a static IP
-    my $sth = $ip_dbh->prepare("select ip,custid,city,ptype,notes,circuitid from poolips".
+    my $sth = $ip_dbh->prepare("select ip,custid,city,type,notes,circuitid from poolips".
         " where ip='$webvar{block}'");
     $sth->execute();
@@ -1216 +1217 @@
     $sth->bind_columns(\$cidr, \$custid, \$city, \$alloctype, \$notes, \$circid);
     $sth->fetch() || croak $sth->errstr;
-
-    $alloctype .="i";
 
   } else { # done with alloctype=~ /^.i$/