Changeset 370 for trunk/cgi-bin

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

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (4 diffs)
• admin.cgi (modified) (1 diff)
• ipdb.psql (modified) (2 diffs)
• main.cgi (modified) (1 diff)
• newcity.cgi (modified) (1 diff)
• search.cgi (modified) (3 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

trunk/cgi-bin/admin.cgi

@@ -570 +570 @@
         " value='$types[0]'>$types[1]</option>\n";
     }
-    print "<option". (($data[2] eq 'in') ? ' selected' : '') .
-        " value='in'>Internal netblock</option>\n</select></td>\n";
 
     print qq(<td><input name=city value="$data[3]"></td>\n).

trunk/cgi-bin/ipdb.psql

@@ -147 +147 @@
 we      Dynamic WiFi block      Dynamic WiFi block      104     WL-RES  ISP-WIFI
 ve      Dynamic VoIP block      Dynamic VoIP block      105     DYN-VOIP        ISP
-li      Static IP - LAN/POP     Static LAN/POP IP       190     6750400 ISP
-ld      Static Pool - LAN/POP   LAN pool        191     6750400 ISP
+li      Static IP - LAN/POP     Static LAN/POP IP       190     NOC-VPN ISP
+li      Static IP - Management  Static management IP    191     NOC-VPN ISP
+ld      Static Pool - LAN/POP   LAN pool        195     NOC-VPN ISP
+ld      Static Pool - Management        Management pool 196     NOC-VPN ISP
+in      Internal netblock       Internal netblock       199     6750400 ISP
 wc      Reserve for CORE/WAN blocks     CORE/WAN blocks 200     6750400 ISP
 pc      Reserve for dynamic-route DSL netblocks Dynamic-route netblocks 201     6750400 ISP-STATIC-DSL
@@ -158 +161 @@
 fr      Fibre   Fibre   223             ISP
 rm      Routing Routed netblock 500     6750400 ISP
-in      Internal netblock       Internal netblock       990     6750400 ISP
 mm      Master block    Master block    999     6750400 ISP
 \.

trunk/cgi-bin/main.cgi

@@ -1283 +1283 @@
   }
 
+  # need to retrieve block data before deleting so we can notify on that
+  my ($cidr,$custid,$type,$city,$description) = getBlockData($ip_dbh, $webvar{block});
+
   my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{alloctype});
 
   if ($code eq 'OK') {
     print "<div class=heading align=center>Success!  $webvar{block} deallocated.</div>\n";
-    syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block}";
+    syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block}".
+        " $custid, $city, desc='$description'";
     # Notify tech@ when a block/IP is deallocated
 #    mailNotify('tech@example.com',"REMOVED: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
-#       "$disp_alloctypes{$webvar{alloctype}} $webvar{block} deallocated by $authuser\n");
+#       "$disp_alloctypes{$webvar{alloctype}} $webvar{block} deallocated by $authuser\n".
+#       "CustID: $custid\nCity: $city\nDescription: $description\n");
   } else {
     if ($webvar{alloctype} =~ /^.i$/) {

trunk/cgi-bin/newcity.cgi

@@ -40 +40 @@
 
 if ($webvar{pop} eq 'on') {
-  $sth = $dbh->prepare("insert into cities values ('$webvar{city}','y')");
+  $sth = $dbh->prepare("insert into cities (city,routing) values ('$webvar{city}','y')");
 } else {
-  $sth = $dbh->prepare("insert into cities values ('$webvar{city}','n')");
+  $sth = $dbh->prepare("insert into cities (city,routing) values ('$webvar{city}','n')");
 }
 $sth->execute;

trunk/cgi-bin/search.cgi

@@ -40 +40 @@
 my %webvar = parse_post();
 cleanInput(\%webvar);
+
+if (defined($webvar{rpp})) {
+  ($RESULTS_PER_PAGE) = ($webvar{rpp} =~ /(\d+)/);
+}
 
 if (!defined($webvar{stype})) {
@@ -185 +189 @@
   } else {
     # Add the limit/offset clauses
-    $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
+    $sql .= " order by cidr";
+    $sql .= " limit $RESULTS_PER_PAGE offset $offset" if $RESULTS_PER_PAGE != 0;
     # And tell the user.
     print "<div class=heading>Searching...............</div>\n";
@@ -420 +425 @@
 
   # print the page thing..
-  if ($rowCount > $RESULTS_PER_PAGE) {
+  if ($RESULTS_PER_PAGE > 0 && $rowCount > $RESULTS_PER_PAGE) {
     my $pages = ceil($rowCount/$RESULTS_PER_PAGE);
     print qq(<div class="center"> Page: );