Changeset 760 for trunk/cgi-bin/main.cgi


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

/trunk

  • Bump extension and refinement of rDNS-is-available flags up into main.cgi.
  • Add a missing breadcrumb call on the merge setup page
  • Add a couple of ##fixme's for distant edge cases
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/cgi-bin/main.cgi

    r751 r760  
    8686print $header->output;
    8787
     88##fixme:  whine and complain when the user is not present in the ACL hash above
    8889
    8990#main()
     
    110111  # Retrieve the list of DNS locations if we've got a place to grab them from
    111112  if ($IPDB::rpc_url) {
    112 
    113113    my %rpcargs = (
    114114        rpcuser => $authuser,
     
    618618## end node hack
    619619
     620  # flag DNS info if we can't publish the entry remotely
     621  my $pinfo = getBlockData($ip_dbh, $webvar{parent});
     622  $page->param(dnslocal => 1) unless ($pinfo->{revpartial} || $pinfo->{revavail});
     623
    620624  # reserve for expansion
    621625  $page->param(reserve => $webvar{reserve});
     
    891895  $blockinfo->{type} =~ s/\s//;
    892896
    893   if ($blockinfo->{revzone}) {
    894     $page->param(revzone => $blockinfo->{revzone});
     897##fixme:  The case of "allocation larger than a /24" (or any similar case
     898# where the allocation is larger than the zone(s) in DNS) doesn't work well.
     899# Best solution may just be to add a warning that the entry shown may not be
     900# correct/complete.
     901  if ($blockinfo->{revavail} || $blockinfo->{revpartial}) {
     902    $page->param(showrev => ($blockinfo->{revavail} || $blockinfo->{revpartial}) );
    895903    my $cached;
    896904    # Get rDNS info;  duplicates a bit of getBlockData but also does the RPC call if possible
    897905    ($blockinfo->{rdns},$cached) = getBlockRDNS($ip_dbh, id => $webvar{id}, type => $blockinfo->{type}, user => $authuser);
     906    $page->param(rdns     => $blockinfo->{rdns});
    898907    # visual flag that we're working IPDB-local, not off more authoritative data in dnsadmin
    899908    $page->param(cached   => $cached);
     
    917926  my ($lastmod,undef) = split /\s+/, $blockinfo->{lastmod};
    918927  $page->param(lastmod  => $lastmod);
    919 #  $page->param(lastmod  => $blockinfo->{lastmod});
    920928
    921929  $page->param(block    => $blockinfo->{block});
     
    960968## end node hack
    961969
    962   $page->param(rdns     => $blockinfo->{rdns});
    963970  $page->param(vrf      => $blockinfo->{vrf});
    964971  $page->param(vlan     => $blockinfo->{vlan});
     
    12201227sub prepMerge {
    12211228  my $binfo = getBlockData($ip_dbh, $webvar{block});
     1229
     1230  # Tree navigation
     1231  my $crumbs = getBreadCrumbs($ip_dbh, $binfo->{parent_id});
     1232  my @rcrumbs = reverse (@$crumbs);
     1233  $utilbar->param(breadcrumb => \@rcrumbs);
     1234
    12221235  $page->param(block => $webvar{block});
    12231236  $page->param(ispool => $binfo->{type} =~ /.[dp]/);
Note: See TracChangeset for help on using the changeset viewer.