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

Timestamp:

10/31/12 16:51:18 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and merge SQL for block-edit page into getBlockData.
Fortunately, the enhancement does not affect previous uses of
that sub. See #34.
Also tweak the template with a whitespace nitpick and to escape
HTML-funky characters in the circuit ID, description, notes, or
restricted data. Still need to confirm these can be reversed
on submission. See The Ticket That Won't Die, #3.

File:

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

trunk/cgi-bin/main.cgi

@@ -638 +638 @@
 sub edit {
 
-  my $sql;
-
-  # Two cases:  block is a netblock, or block is a static IP from a pool
-  # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
-##fixme:  allow "SWIP" (publication to rWHOIS) of static IP data
-  if ($webvar{block} =~ /\/32$/) {
-    $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp,privdata from poolips where ip='$webvar{block}'";
-  } else {
-    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,swip from allocations where cidr='$webvar{block}'"
-  }
-
-  # gotta snag block info from db
-  $sth = $ip_dbh->prepare($sql);
-  $sth->execute;
-  my @data = $sth->fetchrow_array;
-
-  # Clean up extra whitespace on alloc type
-  $data[2] =~ s/\s//;
-
-  # We can't let the city be changed here;  this block is a part of
-  # a larger routed allocation and therefore by definition can't be moved.
-  # block and city are static.
-##fixme
-# Needs thinking.  Have to allow changes to city to correct errors, no?
-# Also have areas where a routed block at a POP serves "many" cities/towns/named crossroads
-
-# @data: cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,swip
+  # snag block info from db
+  my $blockinfo = getBlockData($ip_dbh, $webvar{block});
+
+  # Clean up extra whitespace on alloc type.  Mainly a legacy-data cleanup.
+  $blockinfo->{type} =~ s/\s//;
 
   $page->param(block => $webvar{block});
 
-  $page->param(custid => $data[1]);
-  $page->param(city => $data[3]);
-  $page->param(circid => $data[4]);
-  $page->param(desc => $data[5]);
-  $page->param(notes => $data[6]);
+  $page->param(custid   => $blockinfo->{custid});
+  $page->param(city     => $blockinfo->{city});
+  $page->param(circid   => $blockinfo->{circuitid});
+  $page->param(desc     => $blockinfo->{description});
+  $page->param(notes    => $blockinfo->{notes});
 
 ##fixme The check here should be built from the database
 # Need to expand to support pool types too
-  if ($data[2] =~ /^.[ne]$/ && $IPDBacl{$authuser} =~ /c/) {
+  if ($blockinfo->{type} =~ /^.[ne]$/ && $IPDBacl{$authuser} =~ /c/) {
     $page->param(changetype => 1);
     $page->param(alloctype => [
-                { selme => ($data[2] eq 'me'), type => "me", disptype => "Dialup netblock" },
-                { selme => ($data[2] eq 'de'), type => "de", disptype => "Dynamic DSL netblock" },
-                { selme => ($data[2] eq 'ce'), type => "ce", disptype => "Dynamic cable netblock" },
-                { selme => ($data[2] eq 'we'), type => "we", disptype => "Dynamic wireless netblock" },
-                { selme => ($data[2] eq 'cn'), type => "cn", disptype => "Customer netblock" },
-                { selme => ($data[2] eq 'en'), type => "en", disptype => "End-use netblock" },
-                { selme => ($data[2] eq 'in'), type => "in", disptype => "Internal netblock" },
+                { selme => ($blockinfo->{type} eq 'me'), type => "me", disptype => "Dialup netblock" },
+                { selme => ($blockinfo->{type} eq 'de'), type => "de", disptype => "Dynamic DSL netblock" },
+                { selme => ($blockinfo->{type} eq 'ce'), type => "ce", disptype => "Dynamic cable netblock" },
+                { selme => ($blockinfo->{type} eq 'we'), type => "we", disptype => "Dynamic wireless netblock" },
+                { selme => ($blockinfo->{type} eq 'cn'), type => "cn", disptype => "Customer netblock" },
+                { selme => ($blockinfo->{type} eq 'en'), type => "en", disptype => "End-use netblock" },
+                { selme => ($blockinfo->{type} eq 'in'), type => "in", disptype => "Internal netblock" },
                 ]
         );
   } else {
-    $page->param(disptype => $disp_alloctypes{$data[2]});
-    $page->param(type => $data[2]);
+    $page->param(disptype => $disp_alloctypes{$blockinfo->{type}});
+    $page->param(type => $blockinfo->{type});
   }
 
@@ -697 +675 @@
   $page->param(havenodeid => $nodeid);
 
-  if ($data[2] eq 'fr' || $data[2] eq 'bi') {
+  if ($blockinfo->{type} eq 'fr' || $blockinfo->{type} eq 'bi') {
     $page->param(typesupportsnodes => 1);
     $page->param(nodename => $nodename);
@@ -715 +693 @@
 ## end node hack
 
-  my ($lastmod,undef) = split /\s+/, $data[7];
+  my ($lastmod,undef) = split /\s+/, $blockinfo->{lastmod};
   $page->param(lastmod => $lastmod);
 
   # not happy with the upside-down logic, but...
-  $page->param(swipable => $data[2] !~ /.i/);
-  $page->param(swip => $data[10] ne 'n');
+  $page->param(swipable => $blockinfo->{type} !~ /.i/);
+  $page->param(swip => $blockinfo->{swip} ne 'n') if $blockinfo->{swip};
 
   # Check to see if we can display sensitive data
   $page->param(nocling => $IPDBacl{$authuser} =~ /s/);
-  $page->param(privdata => $data[8]);
+  $page->param(privdata => $blockinfo->{privdata});
 
   # ACL trickery - these two template booleans control the presence of all form/input tags