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

Timestamp:

10/09/14 18:13:22 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 10/mumble for work done intermittently over the past ~year.
See #5, comment 25:

• Update block delete. Includes a little current work to fix outstanding edge case issues

File:

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

trunk/cgi-bin/main.cgi

@@ -821 +821 @@
 
   my $blockdata;
-
-  if ($webvar{rdepth} == 0) {   # $webvar{alloctype} eq 'mm'
-
-    $blockdata->{block} = $webvar{block};
+  $blockdata = getBlockData($ip_dbh, $webvar{block}, $webvar{basetype});
+
+  if ($blockdata->{parent_id} == 0) {   # $webvar{alloctype} eq 'mm'
     $blockdata->{city} = "N/A";
     $blockdata->{custid} = "N/A";
-    $blockdata->{type} = 'mm';
     $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}, $webvar{rdepth});
-
   } # end cases for different alloctypes
 
+  $page->param(blockid => $webvar{block});
+  $page->param(basetype => $webvar{basetype});
+
   $page->param(block => $blockdata->{block});
-
   $page->param(rdns => $blockdata->{rdns});
 
@@ -853 +847 @@
   }
 
-  $page->param(rdepth => $blockdata->{rdepth});
   $page->param(disptype => $disp_alloctypes{$blockdata->{type}});
-#  $page->param(type => $blockdata->{type});
   $page->param(city => $blockdata->{city});
   $page->param(custid => $blockdata->{custid});
@@ -883 +875 @@
 
   # need to retrieve block data before deleting so we can notify on that
-  my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
-
-  my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{rdepth}, $webvar{vrf}, $webvar{delforward}, $authuser);
-
-  $page->param(block => $webvar{block});
-  $page->param(delparent => $blockinfo->{parent}) if $webvar{rdepth};
-  $page->param(prdepth => $webvar{rdepth});
+  my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{basetype});
+  my $pinfo = getBlockData($ip_dbh, $blockinfo->{parent_id}, 'b');
+
+  my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{basetype}, $webvar{delforward}, $authuser);
+
+  $page->param(block => $blockinfo->{block});
+  $page->param(delparent_id => $blockinfo->{parent_id});# if $webvar{rdepth};
+  $page->param(delparent => $pinfo->{block});
+  $page->param(returnpool => ($webvar{basetype} eq 'i') );
   if ($code =~ /^WARN(POOL|MERGE)/) {
-    my ($bp,$bd) = split /,/, $msg;
-    $page->param(bparent => $bp);
-    $page->param(brdepth => $bd);
+    my ($pid,$pcidr) = split /,/, $msg;
+    $page->param(parent_id => $pid);
+    $page->param(parent => $pcidr);
     $page->param(mergeip => $code eq 'WARNPOOL');
   }
@@ -901 +895 @@
   }
   if ($code eq 'OK' || $code =~ /^WARN/) {
-    syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block} ".
+    syslog "notice", "$authuser deallocated '".$blockinfo->{type}."'-type netblock $webvar{block} ".
         $blockinfo->{custid}.", ".$blockinfo->{city}.", desc='".$blockinfo->{description}."'";
-    mailNotify($ip_dbh, 'da', "REMOVED: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
-        "$disp_alloctypes{$webvar{alloctype}} $webvar{block} deallocated by $authuser\n".
+    mailNotify($ip_dbh, 'da', "REMOVED: ".$disp_alloctypes{$blockinfo->{type}}." $webvar{block}",
+        $disp_alloctypes{$blockinfo->{type}}." $webvar{block} deallocated by $authuser\n".
         "CustID: ".$blockinfo->{custid}."\nCity: ".$blockinfo->{city}.
         "\nDescription: ".$blockinfo->{description}."\n");