Changeset 320 for trunk/cgi-bin/main.cgi

Timestamp:

04/04/06 18:25:28 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge all bugfixes, hacks, tweaks, and miscellaneous updates from
/branches/stable necessary to bring code into line. Aside from
CustID verification and notification bits, /trunk and
/branches/stable should now be identical.

File:

• trunk/cgi-bin/main.cgi (modified) (15 diffs)

trunk/cgi-bin/main.cgi

@@ -103 +103 @@
 
     if ($@) {
-      carp "Transaction aborted because $@";
+      my $msg = $@;
+      carp "Transaction aborted because $msg";
       eval { $ip_dbh->rollback; };
-      syslog "err", "Could not add master block '$webvar{cidr}' to database: '$@'";
-      printError("Could not add master block $webvar{cidr} to database: $@");
+      syslog "err", "Could not add master block '$webvar{cidr}' to database: '$msg'";
+      printError("Could not add master block $webvar{cidr} to database: $msg");
     } else {
       print "<div type=heading align=center>Success!</div>\n";
@@ -414 +415 @@
         qq($master ($data[0]):</div></center><br>\n);
 
-  startTable('CIDR allocation','Customer Location','Type','CustID','Description/Name');
+  startTable('CIDR allocation','Customer Location','Type','CustID','SWIPed?','Description/Name');
 
   # Snag the allocations for this block
-  $sth = $ip_dbh->prepare("select cidr,city,type,custid,description".
+  $sth = $ip_dbh->prepare("select cidr,city,type,custid,swip,description".
         " from allocations where cidr <<= '$master' order by cidr");
   $sth->execute();
@@ -423 +424 @@
   my $count=0;
   while (my @data = $sth->fetchrow_array()) {
-    # cidr,city,type,custid,description, as per the SELECT
+    # cidr,city,type,custid,swip,description, as per the SELECT
     my $cidr = new NetAddr::IP $data[0];
 
@@ -432 +433 @@
     my @row = ( (($data[2] =~ /^.r$/) ? 'Sub ' : '').
         qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
-        $data[1], $disp_alloctypes{$data[2]}, $data[3], $data[4]);
+        $data[1], $disp_alloctypes{$data[2]}, $data[3], 
+        ($data[4] eq 'y' ? 'Yes' : 'No'), $data[5]);
     # If the allocation is a pool, allow listing of the IPs in the pool.
     if ($data[2] =~ /^.[pd]$/) {
@@ -710 +712 @@
       my $city;
       my $failmsg;
+      my $extracond = '';
+      if ($webvar{allocfrom} eq '-') {
+        $extracond = ($webvar{allowpriv} eq 'on' ? '' : 
+                " and not (cidr <<= '192.168.0.0/16'".
+                        " or cidr <<= '10.0.0.0/8'".
+                        " or cidr <<= '172.16.0.0/12')");
+      }
+      my $sortorder;
       if ($webvar{alloctype} eq 'rm') {
         if ($webvar{allocfrom} ne '-') {
           $sql = "select * from freeblocks where maskbits<=$webvar{maskbits} and routed='n'".
-                " and cidr <<= '$webvar{allocfrom}' order by maskbits desc";
+                " and cidr <<= '$webvar{allocfrom}'";
+          $sortorder = "maskbits desc";
         } else {
-          $sql = "select * from freeblocks where maskbits<=$webvar{maskbits} and routed='n'".
-                " order by maskbits desc";
+          $sql = "select * from freeblocks where maskbits<=$webvar{maskbits} and routed='n'";
+          $sortorder = "maskbits desc";
         }
         $failmsg = "No suitable free block found.<br>\nWe do not have a free".
@@ -745 +756 @@
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
                 " and cidr <<= '$webvar{allocfrom}' and routed='".
-                (($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y')."' order by maskbits desc,cidr";
+                (($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y')."'";
+          $sortorder = "maskbits desc,cidr";
         } else {
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
-                " and routed='".(($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y').
-                "' order by maskbits desc,cidr";
+                " and routed='".(($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y')."'";
+          $sortorder = "maskbits desc,cidr";
         }
       }
+      $sql = $sql.$extracond." order by ".$sortorder;
       $sth = $ip_dbh->prepare($sql);
       $sth->execute;
@@ -914 +927 @@
   } else {
     # New!  Improved!  And now Loaded From The Database!!
-    $webvar{custid} = $def_custids{$webvar{alloctype}};
+    if ((!$webvar{custid}) || ($webvar{custid} ne 'STAFF')) {
+      $webvar{custid} = $def_custids{$webvar{alloctype}};
+    }
   }
 
@@ -929 +944 @@
   } else {
     $flag = 'n';
-    if ($webvar{alloctype} =~ /[wp][cr]|[ds][pi]/) {
+    if ($webvar{alloctype} =~ /[wp][cr]|d[pi]/) {
       # Set this forcibly rather than messing around elsewhere.  Yes, this *is* a hack.  PTHBTT!!
-      $webvar{pop} = 'Sudbury';
-    }
-    if ($webvar{pop} =~ /^-$/) {
+      # Match CORE/WAN types (wc, wr, pc, pr), DSL pool and IP (dp, di).
+      $webvar{pop} = "Sudbury";
+    } elsif ($webvar{pop} =~ /^-$/) {
       $flag = 'to route the block from/through';
     }
@@ -957 +972 @@
   # 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,type,city,circuitid,description,notes,modifystamp,privdata from poolips where ip='$webvar{block}'";
+    $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp,privdata,oldcustid from poolips where ip='$webvar{block}'";
   } else {
-    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata from allocations where cidr='$webvar{block}'"
+    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,oldcustid,swip from allocations where cidr='$webvar{block}'"
   }
 
@@ -1006 +1021 @@
       $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}<input type=hidden name=alloctype value="$data[2]">/g;
     }
+    $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g;
     $html =~ s/\$\$CITY\$\$/<input type=text name=city value="$data[3]">/g;
     $html =~ s/\$\$CIRCID\$\$/<input type="text" name="circid" value="$data[4]" maxlength=64 size=64 class="regular">/g;
@@ -1012 +1028 @@
   } else {
     $html =~ s/\$\$CUSTID\$\$/$data[1]/g;
+    $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g;
     $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}/g;
     $html =~ s/\$\$CITY\$\$/$data[3]/g;
@@ -1020 +1037 @@
   my ($lastmod,undef) = split /\s+/, $data[7];
   $html =~ s/\$\$LASTMOD\$\$/$lastmod/g;
+
+## Hack time!  SWIP isn't going to stay, so I'm not going to integrate it with ACLs.
+if ($data[2] =~ /.i/) {
+  $html =~ s/\$\$SWIP\$\$/N\/A/;
+} else {
+  my $tmp = (($data[10] eq 'n') ? '<input type=checkbox name=swip>' : 
+        '<input type=checkbox name=swip checked=yes>');
+  $html =~ s/\$\$SWIP\$\$/$tmp/;
+}
 
   # Allows us to "correctly" colour backgrounds in table
@@ -1091 +1117 @@
       $sql = "update allocations set custid='$webvar{custid}',".
         "description='$webvar{desc}',notes='$webvar{notes}',city='$webvar{city}',".
-        "type='$webvar{alloctype}',circuitid='$webvar{circid}'$privdata ".
+        "type='$webvar{alloctype}',circuitid='$webvar{circid}'$privdata,".
+        "swip='".($webvar{swip} eq 'on' ? 'y' : 'n')."' ".
         "where cidr='$webvar{block}'";
     }
@@ -1115 +1142 @@
   my $html = join('', <HTML>);
 
+my $swiptmp = ($webvar{swip} eq 'on' ? 'Yes' : 'No');
   $html =~ s/\$\$BLOCK\$\$/$webvar{block}/g;
   $webvar{city} = desanitize($webvar{city});
@@ -1121 +1149 @@
   $html =~ s/\$\$TYPEFULL\$\$/$disp_alloctypes{$webvar{alloctype}}/g;
   $html =~ s/\$\$CUSTID\$\$/$webvar{custid}/g;
+  $html =~ s/\$\$SWIP\$\$/$swiptmp/g;
   $webvar{circid} = desanitize($webvar{circid});
   $html =~ s/\$\$CIRCID\$\$/$webvar{circid}/g;