Changeset 315 for branches/stable

Timestamp:

03/31/06 13:48:28 (18 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Billing raduser crosslink:

Merge /trunk r297, r299, clean
Merge first two segments of /trunk r300 as-is (clean);

manually update code for third segment because merge is not clean

Merge first two segments of /trunk r301 as-is (clean);

third segment is a tweak on the dev version of the CustID check
and should be ignored

Merge /trunk r302, clean
Merge /trunk r312, 313, and 314, clean

File:

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

branches/stable/cgi-bin/main.cgi

@@ -754 +754 @@
             " chose a smaller blocksize.";
         }
-        if ($webvar{allocfrom} ne '-') {
+        if (defined $webvar{allocfrom} && $webvar{allocfrom} ne '-') {
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
                 " and cidr <<= '$webvar{allocfrom}' and routed='".
@@ -827 +827 @@
     $i++;
   }
+# We're going to abuse $$PRIVDATA$$ to stuff in some stuff for billing.
+  $privdata .= "<input type=hidden name=billinguser value=$webvar{userid}>\n"
+        if $webvar{userid};
   $html =~ s/\$\$PRIVDATA\$\$/$privdata/g;
 
@@ -858 +861 @@
   if ($code eq 'OK') {
     if ($webvar{alloctype} =~ /^.i$/) {
-      print qq(<div class="center"><div class="heading">The IP $msg has been allocated to customer $webvar{custid}</div></div>);
+      $msg =~ s|/32||;
+      print qq(<div class="center"><div class="heading">The IP $msg has been allocated to customer $webvar{custid}</div>).
+        ( ($webvar{alloctype} eq 'di' && $webvar{billinguser}) ?
+                qq(<div><a href="https://billing.example.com/extserv.pl?).
+                "action=new_radius_user&custid=$webvar{custid}&userid=$webvar{billinguser}".
+                qq(&ipdb=1&ip=$msg">Add this IP to RADIUS user table</a></div>)
+        : "</div>");
       # Notify tech@example.com
       mailNotify('tech@example.com',"ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
@@ -864 +873 @@
         "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
     } 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></div>";
+        "sucessfully added as: $disp_alloctypes{$webvar{alloctype}}</div>".
+        ( ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) ?
+                qq(<div><a href="https://billing.example.com/extserv.pl?).
+                "action=new_radius_user&custid=$webvar{custid}&userid=$webvar{billinguser}".
+                "&route_subnet=".$netblock->addr."&subnet_slash=".$netblock->masklen.
+                "&include_routed_subnet=1&ipdb=1".
+                qq(">Add this netblock to RADIUS user table</a></div>)
+        : "</div>");
     }
     syslog "notice", "$authuser allocated '$webvar{fullcidr}' to '$webvar{custid}' as ".
@@ -942 +959 @@
   } else {
     $flag = 'n';
-    if ($webvar{alloctype} =~ /w./) {
-      $webvar{pop} = "Sudbury";
-    } elsif ($webvar{pop} =~ /^-$/) {
+    if ($webvar{alloctype} =~ /[wp][cr]|[ds][pi]/) {
+      # Set this forcibly rather than messing around elsewhere.  Yes, this *is* a hack.  PTHBTT!!
+      $webvar{pop} = 'Sudbury';
+    }
+    if ($webvar{pop} =~ /^-$/) {
       $flag = 'to route the block from/through';
     }