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

Timestamp:

03/08/05 17:37:46 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Caught some buglets in the HairyPerl(TM) ('$1' vs "$1")
Corrected a potentially annoying SQL buglet relating to the

selection of which netblock an allocation is to be taken from;
under certain conditions it would pick a larger block to slice
up while there was still a perfectly usable block just the
right size waiting to be allocated.

Removed display of back-end alloctypes from success/failure notes
Corrected comments referring to alloctypes that have been altered
Updated IPDB "default" schema and alloctypes list with current

base information

File:

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

trunk/cgi-bin/main.cgi

@@ -890 +890 @@
           $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 cidr,maskbits desc";
+                (($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y')."' order by 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 cidr,maskbits desc";
+                " and routed='".(($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y').
+                "' order by maskbits desc,cidr";
         }
       }
@@ -976 +976 @@
     } else {
       print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
-        "sucessfully added as type '$webvar{alloctype}' ".
-        "($disp_alloctypes{$webvar{alloctype}})</div></div>";
+        "sucessfully added as: $disp_alloctypes{$webvar{alloctype}}</div></div>";
     }
     syslog "notice", "$authuser allocated '$webvar{fullcidr}' to '$webvar{custid}' as ".
@@ -984 +983 @@
     syslog "err", "Allocation of '$webvar{fullcidr}' to '$webvar{custid}' as ".
         "'$webvar{alloctype}' by $authuser failed: '$msg'";
-    printError("Allocation of $webvar{fullcidr} as $disp_alloctypes{$webvar{alloctype}}".
+    printError("Allocation of $webvar{fullcidr} as '$disp_alloctypes{$webvar{alloctype}}'".
         " failed:<br>\n$msg\n");
   }
@@ -1232 +1231 @@
     $desc = "N/A";
     $notes = "N/A";
-  } elsif ($webvar{alloctype} =~ /^.i$/) { # done with alloctype=rr
+  } elsif ($webvar{alloctype} =~ /^.i$/) { # done with alloctype=[rm]m
 
     # Unassigning a static IP