Changeset 286 for branches/stable/cgi-bin/IPDB.pm

Timestamp:

09/23/05 15:54:31 (19 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge changes from /trunk revisions:

234
237
254 (ipdb.css only)
261
279
284
285

This merges the new search system (234, 237, 254), cleans up
some display CSS (254, 279), cleans up some leftover code (r261),
and merges the "private data" code (284, 285 - note SWIP hacks conflict).

/trunk should now be almost identical to /branches/stable.

File:

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

branches/stable/cgi-bin/IPDB.pm

@@ -184 +184 @@
 # Does all of the magic of actually allocating a netblock
 # Requires database handle, block to allocate, custid, type, city,
-#       description, notes, circuit ID, block to allocate from, 
+#       description, notes, circuit ID, block to allocate from, private data
 # Returns a success code and optional error message.
 sub allocateBlock {
-  my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid) = @_;
-  
+  my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid,$privdata) = @_;
+
   my $cidr = new NetAddr::IP $_[1];
   my $alloc_from = new NetAddr::IP $_[2];
@@ -220 +220 @@
       $sth = $dbh->prepare("update poolips set custid='$custid',".
         "city='$city',available='n',description='$desc',notes='$notes',".
-        "circuitid='$circid'".
+        "circuitid='$circid',privdata='$privdata'".
         " where ip='$cidr'");
       $sth->execute;
@@ -263 +263 @@
           }
           $sth = $dbh->prepare("insert into allocations".
-                " (cidr,custid,type,city,description,notes,maskbits,circuitid)".
+                " (cidr,custid,type,city,description,notes,maskbits,circuitid,privdata)".
                 " values ('$cidr','$custid','$type','$city','$desc','$notes',".
-                $cidr->masklen.",'$circid')");
+                $cidr->masklen.",'$circid','$privdata')");
           $sth->execute;
 
@@ -361 +361 @@
           # Insert the allocations entry
           $sth = $dbh->prepare("insert into allocations (cidr,custid,type,city,".
-                "description,notes,maskbits,circuitid)".
+                "description,notes,maskbits,circuitid,privdata)".
                 " values ('$cidr','$custid','$type','$city','$desc','$notes',".
-                $cidr->masklen.",'$circid')");
+                $cidr->masklen.",'$circid','$privdata')");
           $sth->execute;