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

Timestamp:

10/09/14 12:37:39 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• Netblock update

File:

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

trunk/cgi-bin/main.cgi

@@ -651 +651 @@
 
   # snag block info from db
-  my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
+  my $blockinfo = getBlockData($ip_dbh, $webvar{id}, $webvar{basetype});
+  $page->param(id => $webvar{id});
+  $page->param(basetype => $webvar{basetype});
 
   # Clean up extra whitespace on alloc type.  Mainly a legacy-data cleanup.
@@ -657 +659 @@
 
   # Get rDNS info;  duplicates a bit of getBlockData but also does the RPC call if possible
-  $blockinfo->{rdns} = getBlockRDNS($ip_dbh, $webvar{block}, $webvar{rdepth}, user => $authuser);
-
-  $page->param(block => $webvar{block});
+  $blockinfo->{rdns} = getBlockRDNS($ip_dbh, id => $webvar{id}, type => $blockinfo->{type}, user => $authuser);
+
+  $page->param(block    => $blockinfo->{block});
   $page->param(rdns     => $blockinfo->{rdns});
-  $page->param(rdepth   => $blockinfo->{rdepth});
 
   $page->param(custid   => $blockinfo->{custid});
@@ -689 +690 @@
 
 ## node hack
-  my ($nodeid,$nodename) = getNodeInfo($ip_dbh, $webvar{block});
-  $page->param(havenodeid => $nodeid);
-
-  if ($blockinfo->{type} eq 'fr' || $blockinfo->{type} eq 'bi') {
-    $page->param(typesupportsnodes => 1);
-    $page->param(nodename => $nodename);
+  my ($nodeid,$nodename) = getNodeInfo($ip_dbh, $blockinfo->{block});
+#  $page->param(havenodeid => $nodeid);
+  $page->param(nodename => $nodename);
 
 ##fixme:  this whole hack needs cleanup and generalization for all alloctypes
 ##fixme:  arguably a bug that presence of a nodeid implies it can be changed..
-#  but except for manual database changes, only the two types fr and bi can
-#  (currently) have a nodeid set in the first place.
-    if ($IPDBacl{$authuser} =~ /c/) {
-      my $nlist = getNodeList($ip_dbh);
+  if ($IPDBacl{$authuser} =~ /c/) {
+    my $nlist = getNodeList($ip_dbh);
+    if ($nodeid) {
       foreach (@{$nlist}) {
-        $$_{selme} = ($$_{node_id} == $nodeid);
+        $$_{selme} = ($$_{node_id} == $nodeid);
       }
-      $page->param(nodelist => $nlist);
-    }
+    }
+    $page->param(nodelist => $nlist);
   }
 ## end node hack
@@ -750 +747 @@
         type            => $webvar{alloctype},
         swip            => $webvar{swip},
-        rdepth          => $webvar{rdepth},
         rdns            => $webvar{rdns},
         user            => $authuser,
@@ -783 +779 @@
 
   # Link back to browse-routed or list-pool page on "Update complete" page.
-  my $cblock = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
-  if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
-    $page->param(backpool => 1);
-    $page->param(backblock => $cblock->{pool});
-  } else {
-    $page->param(backblock => $cblock->{parent});
-  }
-  $page->param(backdepth => ($webvar{rdepth}));
+  my $binfo = getBlockData($ip_dbh, $webvar{block}, $webvar{basetype});
+  my $pblock = getBlockData($ip_dbh, $binfo->{parent_id});
+  $page->param(backid => $binfo->{parent_id});
+  $page->param(backblock => $pblock->{block});
+  $page->param(backpool => ($webvar{basetype} eq 'i'));
 
   # Do some HTML fiddling here instead of using ESCAPE=HTML in the template,
@@ -799 +792 @@
   $webvar{privdata} =~ s/\n/<br>\n/;
 
-  $page->param(cidr => $webvar{block});
+  $page->param(cidr => $binfo->{block});
   $page->param(rdns => $webvar{rdns});
   $page->param(city => $webvar{city});