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

Timestamp:

02/25/15 18:09:13 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

• Complete internal handling for "shrink block". See #7 (more or less).
• Add "breadcrumb" navigation fragments to split/shrink prep and do pages
• Add link to pool IP list on edit and split/shrink prep pages
• Shave off some useless code showing the split results
• Catch the theoretically impossible case of "no subact value" on submitting split/shrink form

Still need to add calls to monkey rDNS on split/shrink changes

File:

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

trunk/cgi-bin/main.cgi

@@ -875 +875 @@
   $utilbar->param(breadcrumb => \@rcrumbs);
 
+  # Show link to IP list for pools
+  $page->param(ispool => 1) if $blockinfo->{type} =~ /^.[dp]$/;
+
   # Clean up extra whitespace on alloc type.  Mainly a legacy-data cleanup.
   $blockinfo->{type} =~ s/\s//;
@@ -1092 +1095 @@
   my $blockinfo = getBlockData($ip_dbh, $webvar{block});
 
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $blockinfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
+
   if ($blockinfo->{type} =~ /^.i$/) {
     $page->param(err => "Can't split a single IP allocation");
@@ -1110 +1118 @@
   if ($blockinfo->{type} =~ /^.d$/) {
     # Non-PPP pools
+    $page->param(ispool => 1);
     if ($oldmask+2 >= $block->bits) {
       $page->param(err => "Can't split a standard netblock pool any further");
@@ -1117 +1126 @@
     $page->param(sp4mask => $oldmask+2) if $oldmask+2 <= $block->bits-2;
   } elsif ($blockinfo->{type} =~ /.p/) {
+    $page->param(ispool => 1);
     # Allow splitting PPP pools down to v4 /31
     $page->param(sp4mask => $oldmask+2) if $oldmask+2 <= $block->bits-1;
@@ -1144 +1154 @@
   my $blockinfo = getBlockData($ip_dbh, $webvar{block});
 
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $blockinfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
+
   if ($blockinfo->{type} =~ /^.i$/) {
     $page->param(err => "Can't split a single IP allocation");
@@ -1151 +1166 @@
   if ($webvar{subact} eq 'split') {
     $page->param(issplit => 1);
-    my $binfo = getBlockData($ip_dbh, $webvar{block});
-    $page->param(cidr => $binfo->{block});
-    my $block = new NetAddr::IP $binfo->{block};
+    my $block = new NetAddr::IP $blockinfo->{block};
     my $newblocks = splitBlock($ip_dbh, $webvar{block}, 'b', $webvar{split});
     if ($newblocks) {
       $page->param(newblocks => $newblocks);
-      # and the backlink to the parent container
-      my $pinfo = getBlockData($ip_dbh, $binfo->{parent_id});
-      $page->param(backid => $binfo->{parent_id});
-      $page->param(backblock => $pinfo->{block});
     } else {
       $page->param(err => $IPDB::errstr);
     }
 
+  } elsif ($webvar{subact} eq 'shrink') {
+    $page->param(nid => $webvar{block});
+    $page->param(newblock => $webvar{shrink});
+    my $newfree = shrinkBlock($ip_dbh, $webvar{block}, $webvar{shrink});
+    if ($newfree) {
+      $page->param(newfb => $newfree);
+    } else {
+      $page->param(err => $IPDB::errstr);
+    }
+
   } else {
-    # Shrink
-  }
+    # Your llama is on fire.
+    $page->param(err => "Missing form field that shouldn't be missing.");
+    return;
+  }
+
+  # common bits
+  $page->param(cidr => $blockinfo->{block});
+  # and the backlink to the parent container
+  my $pinfo = getBlockData($ip_dbh, $blockinfo->{parent_id});
+  $page->param(backid => $blockinfo->{parent_id});
+  $page->param(backblock => $pinfo->{block});
 } # doSplit()