Changeset 759 for trunk/cgi-bin


Ignore:
Timestamp:
07/28/15 18:00:43 (9 years ago)
Author:
Kris Deugau
Message:

/trunk

Roll up a handful of minor tweaks, typofixes, and cosmetic nudges.
Includes marginally less minor local user passthrough for rDNS RPC in shrinkBlock().

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/cgi-bin/IPDB.pm

    r758 r759  
    10851085# List the IPs in an IP pool.
    10861086# Takes a pool/parent ID
    1087 # Returns
    10881087# Returns an arrayref to a list of hashrefs containing the IP, customer ID, availability flag,
    10891088# description, backreference to the pool/parent, and the IP ID in the pool.
     
    18451844  }
    18461845
     1846##fixme:  RPC failures?
    18471847  return ('OK','OK');
    18481848} # end updateBlock()
     
    20082008
    20092009  # Only try to update rDNS when the original block is flagged as "rDNS available"
    2010   _rpc('splitTemplate', cidr => $binfo->{block}, newmask => $args{newmask}, rpcuser => $args{user});
     2010  _rpc('splitTemplate', cidr => $binfo->{block}, newmask => $args{newmask}, rpcuser => $args{user})
    20112011      if ($binfo->{revavail} || $binfo->{revpartial});
    20122012
     
    20262026  # just take the new CIDR spec;  this way we can shrink eg .16/28 to .20/30 without extra contortions
    20272027  my $newblock = new NetAddr::IP shift;
     2028
     2029  my $user = shift;
    20282030
    20292031  if (!$newblock) {
     
    21382140
    21392141  # Only try to update rDNS when the original block is flagged as "rDNS available"
    2140   _rpc('resizeTemplate', oldcidr => $binfo->{block}, newcidr => $newblock->network, rpcuser => $args{user});
     2142  _rpc('resizeTemplate', oldcidr => $binfo->{block}, newcidr => $newblock->network, rpcuser => $user)
    21412143      if ($binfo->{revavail} || $binfo->{revpartial});
    21422144
Note: See TracChangeset for help on using the changeset viewer.