Changeset 839 for trunk


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/cgi-bin/IPDB.pm

    r833 r839  
    137137our $numeric_vlan = 1;
    138138
     139# Billing system return link
     140our $billinglink = 'https://billing.example.com/radius.pl';
    139141
    140142##

  • trunk/cgi-bin/MyIPDB.pm

    r836 r839  
    8888#$IPDB::numeric_vlan = 1;
    8989
     90## Billing return link
     91# Passalong link for allocations initiated by a link in from a billing system
     92#$IPDB::billinglink = 'https://billing.example.com/radius.pl';
     93
    9094## connectDB_My()
    9195# Wrapper for IPDB::connectDB

  • trunk/cgi-bin/main.cgi

    r835 r839  
    889889      $page->param(custid => $webvar{custid});
    890890      $page->param(billinguser => $webvar{billinguser});
     891      $page->param(billinglink => $IPDB::billinglink);
    891892      mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
    892893        "$disp_alloctypes{$webvar{alloctype}} $msg allocated to customer $webvar{custid}\n".
    … …  
    905906      if ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) {
    906907        $page->param(billinguser => $webvar{billinguser});
     908        $page->param(billinglink => $IPDB::billinglink);
    907909        $page->param(custid => $webvar{custid});
    908910        $page->param(netaddr => $netblock->addr);

  • trunk/templates/insert.tmpl

    r766 r839  
    1010<div class="heading">The IP <TMPL_VAR NAME=staticip> has been allocated to customer <TMPL_VAR NAME=custid></div>
    1111<TMPL_IF billinguser>
    12 <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>
     12<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>
    1313</TMPL_IF>
    1414</div>
    … …  
    1818<div class="heading">The block <TMPL_VAR NAME=fullcidr> was sucessfully added as: <TMPL_VAR NAME=alloctype></div>
    1919<TMPL_IF billinguser>
    20 <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>
     20<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>
    2121</TMPL_IF>
    2222</div>
Note: See TracChangeset for help on using the changeset viewer.