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

Timestamp:

04/05/05 14:24:52 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Port bugfixes from /branches/stable r203-206 and r209-213 forward.
Clean merge.

File:

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

trunk/cgi-bin/main.cgi

@@ -171 +171 @@
 print qq(<div align=right style="position: absolute; right: 30px;">).
         qq(<a href="/ip/cgi-bin/admin.cgi">Admin tools</a></div><br>\n)
-        if $authuser =~ /kdeugau|jodyh/;
+        if $authuser =~ /kdeugau|jodyh|jipp/;
 
 # We print the footer here, so we don't have to do it elsewhere.
@@ -815 +815 @@
   if ($webvar{alloctype} =~ /^.i$/) {
     my ($base,undef) = split //, $webvar{alloctype};    # split into individual chars
-    my $sql;
-    # Check for pools in Subury or North Bay if DSL or server pool.  Anywhere else is
-    # invalid and shouldn't be in the db in the first place.
+    my ($sql,$city);
+    # Check for pools in Subury, North Bay, or Toronto if DSL or server pool.
+    # Anywhere else is invalid and shouldn't be in the db in the first place.
     # ... aside from #^%#$%#@#^%^^!!!! legacy data.  GRRR.
     # Note that we want to retain the requested city to relate to customer info.
-##fixme This needs thought.
-##SELECT DISTINCT pool, Count(*) FROM poolips where available='y' GROUP BY pool;
     if ($base =~ /^[ds]$/) {
-      $sql = "select * from poolips where available='y' and".
-        " type='$webvar{alloctype}' and (city='Sudbury' or city='North Bay')";
+      $city = "(allocations.city='Sudbury' or allocations.city='North Bay' or ".
+        "allocations.city='Toronto')";
     } else {
-      $sql = "select * from poolips where available='y' and".
-        " type='$webvar{alloctype}' and city='$webvar{pop}'";
-    }
-
-    # Now that we know where we're looking, we can list the pools with free IPs.
-    $sth = $ip_dbh->prepare($sql);
+      $city = "allocations.city='$webvar{pop}'";
+    }
+
+# Ewww.  But it works.
+    $sth = $ip_dbh->prepare("SELECT (SELECT city FROM allocations WHERE cidr=poolips.pool), ".
+        "poolips.pool, COUNT(*) FROM poolips,allocations WHERE poolips.available='y' AND ".
+        "poolips.pool=allocations.cidr AND $city AND poolips.type LIKE '".$base."_' ".
+        "GROUP BY pool");
     $sth->execute;
-    my %ipcount;
     my $optionlist;
     while (my @data = $sth->fetchrow_array) {
-      $ipcount{$data[0]}++;
-    }
-    $sth = $ip_dbh->prepare("select city from allocations where cidr=?");
-    foreach my $key (keys %ipcount) {
-      $sth->execute($key);
-      my @data = $sth->fetchrow_array;
-      $optionlist .= "<option value='$key'>$key [$ipcount{$key} free IP(s)] in $data[0]</option>\n";
+      # city,pool cidr,free IP count
+      if ($data[2] > 0) {
+        $optionlist .= "<option value='$data[1]'>$data[1] [$data[2] free IP(s)] in $data[0]</option>\n";
+      }
     }
     $cidr = "Single static IP";
@@ -875 +871 @@
 ##fixme
 # This section needs serious Pondering.
-        # Pools of all types get assigned to the POP they're "routed from"
+        # Pools of most types get assigned to the POP they're "routed from"
         # This includes WAN blocks and other netblock "containers"
-        if ($webvar{alloctype} =~ /^.[pdc]$/) {
-          if (($webvar{city} !~ /^(Sudbury|North Bay)$/) && ($webvar{alloctype} eq 'dp')) {
-            printError("You must chose Sudbury or North Bay for DSL pools.");
+        # This does NOT include cable pools.
+        if ($webvar{alloctype} =~ /^.[pc]$/) {
+          if (($webvar{city} !~ /^(Sudbury|North Bay|Toronto)$/) && ($webvar{alloctype} eq 'dp')) {
+            printError("You must chose Sudbury, North Bay, or Toronto for DSL pools.");
             return;
           }
@@ -976 +973 @@
       print qq(<div class="center"><div class="heading">The IP $msg has been allocated to customer $webvar{custid}</div></div>);
       # Notify tech@example.com
-      mailNotify('tech@example.com',"$disp_alloctypes{$webvar{alloctype}} allocation",
+      mailNotify('tech@example.com',"ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
         "$disp_alloctypes{$webvar{alloctype}} $msg allocated to customer $webvar{custid}\n".
         "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
@@ -1015 +1012 @@
   # CustID check
   # We have different handling for customer allocations and "internal" or "our" allocations
-  if ($webvar{alloctype} =~ /^(cn|.i)$/) {
+  if ($def_custids{$webvar{alloctype}} eq '') {
     if (!$webvar{custid}) {
       printError("Please enter a customer ID.");
@@ -1294 +1291 @@
     print "<div class=heading align=center>Success!  $webvar{block} deallocated.</div>\n";
     syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block}";
+    # 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");
   } else {
     if ($webvar{alloctype} =~ /^.i$/) {