Changeset 370 for trunk/cgi-bin/IPDB.pm

Timestamp:

11/27/07 12:18:27 (17 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge bugfixes and enhancements from /branches/stable r351 through r359

File:

• trunk/cgi-bin/IPDB.pm (modified) (4 diffs)

trunk/cgi-bin/IPDB.pm

@@ -25 +25 @@
         %allocated %free %routed %bigfree %IPDBacl
         &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &deleteBlock
-        &mailNotify
+        &getBlockData &mailNotify
         );
 
@@ -33 +33 @@
                 @masterblocks %allocated %free %routed %bigfree %IPDBacl
                 &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
-                &deleteBlock &mailNotify
+                &deleteBlock &getBlockData &mailNotify
                 )]
         );
@@ -492 +492 @@
       $msg = "Unable to deallocate $disp_alloctypes{$type} $cidr";
       $sth = $dbh->prepare("update poolips set custid='6750400',available='y',".
-        "city=(select city from allocations where cidr >>= '$cidr'),".
+        "city=(select city from allocations where cidr >>= '$cidr'".
+        " order by masklen(cidr) desc limit 1),".
         "description='',notes='',circuitid='' where ip='$cidr'");
       $sth->execute;
@@ -643 +644 @@
 
 
+## IPDB::getBlockData()
+# Return custid, type, city, and description for a block
+sub getBlockData {
+  my $dbh = shift;
+  my $block = shift;
+
+  my $sth = $dbh->prepare("select cidr,custid,type,city,description from searchme".
+        " where cidr='$block'");
+  $sth->execute();
+  return $sth->fetchrow_array();
+} # end getBlockData()
+
+
 ## IPDB::mailNotify()
 # Sends notification mail to recipients regarding an IPDB operation