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

Timestamp:

11/16/11 16:28:37 (13 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Prep-for-release cleanup of buglets found making sure the demo
install works

• Clean up instructions for creating the database. Apparently the PL/pgSQL "language" module required for the last-modified triggers can't be installed by a regular user, and isn't available by default. O_o
• Fix a missed $IPDB::webpath-in-single-quotes
• Add a quick hack to allow automagical allocation from private net ranges. See #38.
• Partially convert some critical bits to use bound parameters in SQL for new allocations. See #34, mostly cleaned up already on /trunk or /branches/htmlform
• Set $privdata = internally so that an allocation via admin tools doesn't error out

File:

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

branches/stable/cgi-bin/IPDB.pm

@@ -72 +72 @@
 our $syslog_facility = 'local2';
 
+# Allow allocations to come from private IP ranges by default?
+# Set to 'y' or 'on' to enable.
+our $allowprivrange = '';
+
 # Let's initialize the globals.
 ## IPDB::initIPDBGlobals()
@@ -312 +316 @@
 sub allocateBlock {
   my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid,$privdata,$nodeid) = @_;
+  $privdata = '' if !defined($privdata);
 
   my $cidr = new NetAddr::IP $_[1];
@@ -399 +404 @@
           $sth = $dbh->prepare("insert into allocations".
                 " (cidr,custid,type,city,description,notes,maskbits,circuitid,privdata)".
-                " values ('$cidr','$custid','$type','$city','$desc','$notes',".
-                $cidr->masklen.",'$circid','$privdata')");
-          $sth->execute;
+                " values ('$cidr','$custid','$type','$city',?,?,".
+                $cidr->masklen.",?,?)");
+          $sth->execute($desc,$notes,$circid,$privdata);
 
           # And initialize the pool, if necessary
@@ -509 +514 @@
           $sth = $dbh->prepare("insert into allocations (cidr,custid,type,city,".
                 "description,notes,maskbits,circuitid,privdata)".
-                " values ('$cidr','$custid','$type','$city','$desc','$notes',".
-                $cidr->masklen.",'$circid','$privdata')");
-          $sth->execute;
+                " values ('$cidr','$custid','$type','$city',?,?,".
+                $cidr->masklen.",?,?)");
+          $sth->execute($desc,$notes,$circid,$privdata);
 
           # And initialize the pool, if necessary