Changeset 301 for trunk

Timestamp:

11/17/05 11:25:31 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Make billing backlink for static DSL IPs more readable in code
Add billing backlink for raduser DSL "netblocks"
Open up (testing) check on CustIDs to allow 5 to 10 digits

instead of 7 or 10.

File:

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

trunk/cgi-bin/main.cgi

@@ -850 +850 @@
       print qq(<div class="center"><div class="heading">The IP $msg has been allocated to customer $webvar{custid}</div>).
         ($webvar{alloctype} eq 'di' ?
-        qq(<div><a href="https://billing.example.com/extserv.pl?action=new_radius_user&oldcustid=$webvar{custid}&userid=$webvar{billinguser}&ip=$msg">Add this IP to RADIUS user table</a></div>)
+                qq(<div><a href="https://billing.example.com/extserv.pl?).
+                "action=new_radius_user&oldcustid=$webvar{custid}&userid=$webvar{billinguser}".
+                qq(&ip=$msg">Add this IP to RADIUS user table</a></div>)
         : "</div>");
       # Notify tech@example.com
@@ -857 +859 @@
 #       "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' ?
+                qq(<div><a href="https://billing.example.com/extserv.pl?).
+                "action=new_radius_user&oldcustid=$webvar{custid}&userid=$webvar{billinguser}".
+                "&route_subnet=".$netblock->addr."&subnet_slash=".$netblock->masklen.
+                qq(">Add this netblock to RADIUS user table</a></div>)
+        : "</div>");
     }
     syslog "notice", "$authuser allocated '$webvar{fullcidr}' to '$webvar{custid}' as ".
@@ -897 +906 @@
       return;
     }
-    if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF|TEMP)(?:-\d\d?)?$/) {
+    if ($webvar{custid} !~ /^(?:\d{5,10}|STAFF|TEMP)(?:-\d\d?)?$/) {
       printError("Please enter a valid customer ID- this must be a 7- or 10-digit number, or STAFF for static IPs for staff.");
       return;