Index: trunk/cgi-bin/main.cgi
===================================================================
--- trunk/cgi-bin/main.cgi	(revision 576)
+++ trunk/cgi-bin/main.cgi	(revision 577)
@@ -792,35 +792,26 @@
   my $blockdata;
 
-  if ($webvar{alloctype} eq 'rm') {
+  if ($webvar{rdepth} == 0) {	# $webvar{alloctype} eq 'mm'
 
     $blockdata->{block} = $webvar{block};
-    $blockdata->{city} = getRoutedCity($ip_dbh, $webvar{block});
+    $blockdata->{city} = "N/A";
     $blockdata->{custid} = "N/A";
-    $blockdata->{type} = $webvar{alloctype};
+    $blockdata->{type} = 'mm';
     $blockdata->{circuitid} = "N/A";
     $blockdata->{description} = "N/A";
     $blockdata->{notes} = "N/A";
     $blockdata->{privdata} = "N/A";
-
-  } elsif ($webvar{alloctype} eq 'mm') {
-
-    $blockdata->{block} = $webvar{block};
-    $blockdata->{city} = "N/A";
-    $blockdata->{custid} = "N/A";
-    $blockdata->{type} = $webvar{alloctype};
-    $blockdata->{circuitid} = "N/A";
-    $blockdata->{description} = "N/A";
-    $blockdata->{notes} = "N/A";
-    $blockdata->{privdata} = "N/A";
+    $blockdata->{rdepth} = 0;
 
   } else {
 
-    $blockdata = getBlockData($ip_dbh, $webvar{block})
+    $blockdata = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
 
   } # end cases for different alloctypes
 
   $page->param(block => $blockdata->{block});
+  $page->param(rdepth => $blockdata->{rdepth});
   $page->param(disptype => $disp_alloctypes{$blockdata->{type}});
-  $page->param(type => $blockdata->{type});
+#  $page->param(type => $blockdata->{type});
   $page->param(city => $blockdata->{city});
   $page->param(custid => $blockdata->{custid});
@@ -850,10 +841,19 @@
 
   # need to retrieve block data before deleting so we can notify on that
-  my $blockinfo = getBlockData($ip_dbh, $webvar{block});
-
-  my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{alloctype});
+  my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
+
+  my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{rdepth}, $webvar{vrf});
 
   $page->param(block => $webvar{block});
-  if ($code eq 'OK') {
+  $page->param(delparent => $blockinfo->{parent}) if $webvar{rdepth};
+  $page->param(prdepth => $webvar{rdepth});
+  if ($code =~ /^WARN/) {
+    my ($bp,$bd) = split /,/, $msg;
+    $page->param(bparent => $bp);
+    $page->param(brdepth => $bd);
+    $page->param(mergeip => $code eq 'WARNPOOL');
+  }
+
+  if ($code eq 'OK' || $code =~ /^WARN/) {
     syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block} ".
 	$blockinfo->{custid}.", ".$blockinfo->{city}.", desc='".$blockinfo->{description}."'";
Index: trunk/templates/delete.tmpl
===================================================================
--- trunk/templates/delete.tmpl	(revision 576)
+++ trunk/templates/delete.tmpl	(revision 577)
@@ -60,5 +60,5 @@
 <input type="button" value="Back" onclick="history.go(-1)"><input type="submit" value="Confirm">
 <input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
-<input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
+<input type="hidden" name="rdepth" value="<TMPL_VAR NAME=rdepth>">
 <input type="hidden" name="action" value="finaldelete">
 </fieldset>
Index: trunk/templates/finaldelete.tmpl
===================================================================
--- trunk/templates/finaldelete.tmpl	(revision 576)
+++ trunk/templates/finaldelete.tmpl	(revision 577)
@@ -1,3 +1,2 @@
-<TMPL_IF webpath></TMPL_IF>
 <div class="center">
 <TMPL_IF failmsg>
@@ -6,4 +5,19 @@
 <TMPL_ELSE>
 <div class="heading">Success!  <TMPL_VAR NAME=block> deallocated.</div>
+<TMPL_IF bparent><br><div>
+Warning:  
+<TMPL_IF mergeip>IPs in <TMPL_VAR NAME=block> were released as available static IPs in <TMPL_VAR NAME=bparent>
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=bparent>&amp;rdepth=<TMPL_VAR NAME=brdepth>"><TMPL_VAR NAME=bparent></a>,<br>
+not released for general netblock assignment under
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=delparent>&amp;rdepth=<TMPL_VAR NAME=prdepth>"><TMPL_VAR NAME=delparent></a>.
+<TMPL_ELSE>
+<TMPL_VAR NAME=block> was released as free and merged with blocks under 
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=bparent>&amp;rdepth=<TMPL_VAR NAME=brdepth>"><TMPL_VAR NAME=bparent></a>,
+not <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=delparent>&amp;rdepth=<TMPL_VAR NAME=prdepth>"><TMPL_VAR NAME=delparent></a>.
+</TMPL_IF>
+</div>
+<TMPL_ELSE>
+<TMPL_IF delparent><div>Return to <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;block=<TMPL_VAR NAME=delparent>&amp;rdepth=<TMPL_VAR NAME=prdepth>"><TMPL_VAR NAME=delparent></a></div></TMPL_IF>
+</TMPL_IF>
 </TMPL_IF>
 </div>