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

Timestamp:

11/09/12 11:57:22 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Minimal server-meltdown-prevention patch for IPv6; create the
block but don't populate IP pools. See #22, sort of.

File:

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

branches/stable/cgi-bin/main.cgi

@@ -888 +888 @@
         $webvar{circid}, $webvar{privdata}, $webvar{node});
 
-  if ($code eq 'OK') {
+  if ($code eq 'OK' || $code eq 'WARN') {
     if ($webvar{alloctype} =~ /^.i$/) {
       $msg =~ s|/32||;
@@ -902 +902 @@
     } else {
       my $netblock = new NetAddr::IP $webvar{fullcidr};
-      print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
-        "sucessfully added as: $disp_alloctypes{$webvar{alloctype}}</div>".
-        ( ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) ?
+      if ($code eq 'OK') {
+        print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
+                "sucessfully added as: $disp_alloctypes{$webvar{alloctype}}</div>";
+      } else {
+        print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was ).
+                " added as $disp_alloctypes{$webvar{alloctype}} with a warning:<br>$msg</div>";
+      }
+      print ( ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) ?
                 qq(<div><a href="https://billing.example.com/radius.pl?).
                 "action=new_radius_user&custid=$webvar{custid}&userid=$webvar{billinguser}".