Changeset 508 for branches/stable/cgi-bin/main.cgi

Timestamp:

11/16/11 16:28:37 (12 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/main.cgi (modified) (3 diffs)

branches/stable/cgi-bin/main.cgi

@@ -446 +446 @@
     # If the allocation is a pool, allow listing of the IPs in the pool.
     if ($data[2] =~ /^.[pd]$/) {
-      $row[0] .= ' &nbsp; <a href="$IPDB::webpath/cgi-bin/main.cgi?action=listpool'.
+      $row[0] .= qq( &nbsp; <a href="$IPDB::webpath/cgi-bin/main.cgi?action=listpool).
         "&pool=$data[0]\">List IPs</a>";
     }
@@ -583 +583 @@
 
     $html =~ s|\$\$WEBPATH\$\$|$IPDB::webpath|g;
+    if ($IPDB::allowprivrange eq 'y' or $IPDB::allowprivrange eq 'on') {
+      $html =~ s/\$\$ALLOWPRIV\$\$/checked=checked/;
+    } else {
+      $html =~ s/\$\$ALLOWPRIV\$\$//;
+    }
 
     # This is a little dangerous, as it's *theoretically* possible to
@@ -614 +619 @@
     close HTML;
     $html =~ s|\$\$WEBPATH\$\$|$IPDB::webpath|g;
+    if ($IPDB::allowprivrange eq 'y' or $IPDB::allowprivrange eq 'on') {
+      $html =~ s/\$\$ALLOWPRIV\$\$/checked=checked/;
+    } else {
+      $html =~ s/\$\$ALLOWPRIV\$\$//;
+    }
     my $masterlist = "<select name=allocfrom><option selected>-</option>\n";
     foreach my $master (@masterblocks) {