Changeset 839

Timestamp:

04/12/16 14:49:45 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Convert a lingering custom patch to another configuration knob. See #26.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (1 diff)
• cgi-bin/MyIPDB.pm (modified) (1 diff)
• cgi-bin/main.cgi (modified) (2 diffs)
• templates/insert.tmpl (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -137 +137 @@
 our $numeric_vlan = 1;
 
+# Billing system return link
+our $billinglink = 'https://billing.example.com/radius.pl';
 
 ##

trunk/cgi-bin/MyIPDB.pm

@@ -88 +88 @@
 #$IPDB::numeric_vlan = 1;
 
+## Billing return link
+# Passalong link for allocations initiated by a link in from a billing system
+#$IPDB::billinglink = 'https://billing.example.com/radius.pl';
+
 ## connectDB_My()
 # Wrapper for IPDB::connectDB

trunk/cgi-bin/main.cgi

@@ -889 +889 @@
       $page->param(custid => $webvar{custid});
       $page->param(billinguser => $webvar{billinguser});
+      $page->param(billinglink => $IPDB::billinglink);
       mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
         "$disp_alloctypes{$webvar{alloctype}} $msg allocated to customer $webvar{custid}\n".
@@ -905 +906 @@
       if ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) {
         $page->param(billinguser => $webvar{billinguser});
+        $page->param(billinglink => $IPDB::billinglink);
         $page->param(custid => $webvar{custid});
         $page->param(netaddr => $netblock->addr);

trunk/templates/insert.tmpl

@@ -10 +10 @@
 <div class="heading">The IP <TMPL_VAR NAME=staticip> has been allocated to customer <TMPL_VAR NAME=custid></div>
 <TMPL_IF billinguser>
-<div><a href="https://billing.example.com/radius.pl?action=new_radius_user&amp;custid=<TMPL_VAR NAME=custid>&amp;userid=<TMPL_VAR NAME=billinguser>&amp;ipdb=1&amp;ip=<TMPL_VAR NAME=staticip>">Add this IP to RADIUS user table</a></div>
+<div><a href="<TMPL_VAR NAME=billinglink>?action=new_radius_user&amp;custid=<TMPL_VAR NAME=custid>&amp;userid=<TMPL_VAR NAME=billinguser>&amp;ipdb=1&amp;ip=<TMPL_VAR NAME=staticip>">Add this IP to RADIUS user table</a></div>
 </TMPL_IF>
 </div>
@@ -18 +18 @@
 <div class="heading">The block <TMPL_VAR NAME=fullcidr> was sucessfully added as: <TMPL_VAR NAME=alloctype></div>
 <TMPL_IF billinguser>
-<div><a href="https://billing.example.com/radius.pl?action=new_radius_user&amp;custid=<TMPL_VAR NAME=custid>&amp;userid=<TMPL_VAR NAME=billinguser>&amp;route_subnet=<TMPL_VAR NAME=netaddr>&amp;subnet_slash=<TMPL_VAR NAME=masklen>&amp;include_routed_subnet=1&amp;ipdb=1">Add this netblock to RADIUS user table</a></div>
+<div><a href="<TMPL_VAR NAME=billinglink>?action=new_radius_user&amp;custid=<TMPL_VAR NAME=custid>&amp;userid=<TMPL_VAR NAME=billinguser>&amp;route_subnet=<TMPL_VAR NAME=netaddr>&amp;subnet_slash=<TMPL_VAR NAME=masklen>&amp;include_routed_subnet=1&amp;ipdb=1">Add this netblock to RADIUS user table</a></div>
 </TMPL_IF>
 </div>