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

Timestamp:

11/16/04 15:24:12 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Backports from /trunk r74:

• Addition of CircuitID field WARNING: This REQUIRES changes to the allocations and poolips tables!!
• New SQL schema definition
• Display bugfix

File:

• branches/stable/cgi-bin/main.cgi (modified) (16 diffs)

branches/stable/cgi-bin/main.cgi

@@ -735 +735 @@
   my $count = 0;
   while (my @data = $sth->fetchrow_array) {
-    # pool,ip,custid,city,ptype,available,notes,description
+    # pool,ip,custid,city,ptype,available,notes,description,circuitid
     # If desc is null, make it not null.  <g>
     if ($data[7] eq '') {
@@ -934 +934 @@
   $html =~ s|\$\$CITY\$\$|$webvar{city}|g;
   $html =~ s|\$\$CUSTID\$\$|$webvar{custid}|g;
+  $html =~ s|\$\$CIRCID\$\$|$webvar{circid}|g;
   $webvar{desc} = desanitize($webvar{desc});
   $webvar{notes} = desanitize($webvar{notes});
@@ -977 +978 @@
 
     $sth = $ip_dbh->prepare("update poolips set custid='$webvar{custid}',".
-        "city='$webvar{city}',available='n',description='$webvar{desc}'".
+        "city='$webvar{city}',available='n',description='$webvar{desc}',".
+        "circuitid='$webvar{circid}'".
         " where ip='$cidr'");
     $sth->execute;
@@ -1029 +1031 @@
           $sth = $ip_dbh->prepare("insert into allocations values ('$webvar{fullcidr}',".
             "'$webvar{custid}','$webvar{alloctype}','$webvar{city}','$webvar{desc}',".
-            "'$webvar{notes}',".$cidr->masklen.")");
+            "'$webvar{notes}',".$cidr->masklen.",'$webvar{circid}')");
           $sth->execute;
         } # routing vs non-routing netblock
@@ -1095 +1097 @@
           $sth = $ip_dbh->prepare("insert into allocations values ('$webvar{fullcidr}',".
             "'$webvar{custid}','$webvar{alloctype}','$webvar{city}',".
-            "'$webvar{desc}','$webvar{notes}',".$cidr->masklen.")");
+            "'$webvar{desc}','$webvar{notes}',".$cidr->masklen.",'$webvar{circid}')");
           $sth->execute;
         } # done with netblock alloctype != rr
@@ -1118 +1120 @@
         # have to insert all pool IPs into poolips table as "unallocated".
         $sth = $ip_dbh->prepare("insert into poolips values ('$webvar{fullcidr}',".
-          " ?, '6750400', '$webvar{city}', '$pooltype', 'y', '')");
+          " ?, '6750400', '$webvar{city}', '$pooltype', 'y', '', '', '')");
         my @poolip_list = $cidr->hostenum;
         for (my $i=1; $i<=$#poolip_list; $i++) {
@@ -1205 +1207 @@
   # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
   if ($webvar{block} =~ /\/32$/) {
-    $sql = "select ip,custid,ptype,city,description,notes from poolips where ip='$webvar{block}'";
+    $sql = "select ip,custid,ptype,city,circuitid,description,notes from poolips where ip='$webvar{block}'";
   } else {
-    $sql = "select cidr,custid,type,city,description,notes from allocations where cidr='$webvar{block}'"
+    $sql = "select cidr,custid,type,city,circuitid,description,notes from allocations where cidr='$webvar{block}'"
   }
 
@@ -1258 +1260 @@
   # These can be modified, although CustID changes may get ignored.
   $html =~ s/\$\$CUSTID\$\$/$data[1]/g;
-  $html =~ s/\$\$DESC\$\$/$data[4]/g;
-  $html =~ s/\$\$NOTES\$\$/$data[5]/g;
+  $html =~ s/\$\$TYPE\$\$/$data[2]/g;
+  $html =~ s/\$\$CIRCID\$\$/$data[4]/g;
+  $html =~ s/\$\$DESC\$\$/$data[5]/g;
+  $html =~ s/\$\$NOTES\$\$/$data[6]/g;
 
   print $html;
@@ -1280 +1284 @@
     my $sql;
     if (my $pooltype = ($webvar{alloctype} =~ /^([cdms])i$/) ) {
-      $sql = "update poolips set custid='$webvar{custid}',".
-        "notes='$webvar{notes}',description='$webvar{desc}' ".
+      $sql = "update poolips set custid='$webvar{custid}',notes='$webvar{notes}',".
+        "circuitid='$webvar{circid}',description='$webvar{desc}' ".
         "where ip='$webvar{block}'";
     } else {
       $sql = "update allocations set custid='$webvar{custid}',".
         "description='$webvar{desc}',notes='$webvar{notes}',city='$webvar{city}',".
-        "type='$webvar{alloctype}' where cidr='$webvar{block}'";
+        "type='$webvar{alloctype}',circuitid='$webvar{circid}' where cidr='$webvar{block}'";
     }
 syslog "debug", $sql;
@@ -1311 +1315 @@
   $html =~ s/\$\$TYPEFULL\$\$/$full_alloc_types{$webvar{alloctype}}/g;
   $html =~ s/\$\$CUSTID\$\$/$webvar{custid}/g;
+  $html =~ s/\$\$CIRCID\$\$/$webvar{circid}/g;
   $html =~ s/\$\$DESC\$\$/$webvar{desc}/g;
   $html =~ s/\$\$NOTES\$\$/$webvar{notes}/g;
@@ -1335 +1340 @@
   }
 
-  my ($cidr, $custid, $type, $city, $desc, $notes, $alloctype);
+  my ($cidr, $custid, $type, $city, $circid, $desc, $notes, $alloctype);
 
   if ($webvar{alloctype} eq 'rr') {
@@ -1349 +1354 @@
     $custid = "N/A";
     $alloctype = $webvar{alloctype};
+    $circid = "N/A";
     $desc = "N/A";
     $notes = "N/A";
@@ -1357 +1363 @@
     $custid = "N/A";
     $alloctype = $webvar{alloctype};
+    $circid = "N/A";
     $desc = "N/A";
     $notes = "N/A";
@@ -1362 +1369 @@
 
     # Unassigning a static IP
-    my $sth = $ip_dbh->prepare("select ip,custid,city,ptype,notes from poolips".
+    my $sth = $ip_dbh->prepare("select ip,custid,city,ptype,notes,circuitid from poolips".
         " where ip='$webvar{block}'");
     $sth->execute();
 #  croak $sth->errstr() if($sth->errstr());
 
-    $sth->bind_columns(\$cidr, \$custid, \$city, \$alloctype, \$notes);
+    $sth->bind_columns(\$cidr, \$custid, \$city, \$alloctype, \$notes, \$circid);
     $sth->fetch() || croak $sth->errstr;
 
@@ -1374 +1381 @@
   } else { # done with alloctype=[sdcmw]i
 
-    my $sth = $ip_dbh->prepare("select cidr,custid,type,city,description,notes from ".
+    my $sth = $ip_dbh->prepare("select cidr,custid,type,city,circuitid,description,notes from ".
         "allocations where cidr='$webvar{block}'");
     $sth->execute();
 #       croak $sth->errstr() if($sth->errstr());
 
-    $sth->bind_columns(\$cidr, \$custid, \$alloctype, \$city, \$desc, \$notes);
-    $sth->fetch() || croak $sth->errstr;
+    $sth->bind_columns(\$cidr, \$custid, \$alloctype, \$city, \$circid, \$desc, \$notes);
+    $sth->fetch() || carp $sth->errstr;
   } # end cases for different alloctypes
 
@@ -1390 +1397 @@
   $html =~ s|\$\$CITY\$\$|$city|g;
   $html =~ s|\$\$CUSTID\$\$|$custid|g;
+  $html =~ s|\$\$CIRCID\$\$|$circid|g;
   $html =~ s|\$\$DESC\$\$|$desc|g;
   $html =~ s|\$\$NOTES\$\$|$notes|g;