Changeset 485

Timestamp:

09/23/10 00:51:55 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Convert pool-IP inserts to use DBI ? substitution on city. See #34.

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -576 +576 @@
     # have to insert all pool IPs into poolips table as "unallocated".
     $sth = $dbh->prepare("insert into poolips (pool,ip,custid,city,type)".
-        " values ('$pool', ?, '$defcustid', '$city', '$type')");
+        " values ('$pool', ?, '$defcustid', ?, '$type')");
     my @poolip_list = $pool->hostenum;
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
       if ($pool->addr !~ /\.0$/) {      # .0 causes weirdness.
-        $sth->execute($pool->addr);
+        $sth->execute($pool->addr, $city);
       }
       for (my $i=0; $i<=$#poolip_list; $i++) {
-        $sth->execute($poolip_list[$i]->addr);
+        $sth->execute($poolip_list[$i]->addr, $city);
       }
       $pool--;
       if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.
-        $sth->execute($pool->addr);
+        $sth->execute($pool->addr, $city);
       }
     } else { # (real netblock)
       for (my $i=1; $i<=$#poolip_list; $i++) {
-        $sth->execute($poolip_list[$i]->addr);
+        $sth->execute($poolip_list[$i]->addr, $city);
       }
     }
   };
   if ($@) {
-    $msg = "'".$sth->errstr."'";
+    $msg = $@." '".$sth->errstr."'";
     eval { $dbh->rollback; };
     return ('FAIL',$msg);