Changeset 536

Timestamp:

10/31/12 17:56:03 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move SQL for post-update backlink to IPDB.pm. See #34.
Also rename getParent() to subParent() to fit in with ipParent() and
blockParent().

Fix a couple "Use of uninitialized..." log-noise bugs. See #31.

Move some HTML-entity-escaping into the template, and shuffle lines
munging the notes and restricted data on post-update value display
so we can properly munge in <br> for \n. Doesn't seem to be a way
to plug that into HTML::Template. :( See #3.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (4 diffs)
• cgi-bin/main.cgi (modified) (6 diffs)
• templates/update.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -29 +29 @@
         &listSummary &listMaster &listRBlock &listFree &listPool
         &getTypeList &getPoolSelect &findAllocateFrom
-        &getParent &getRoutedCity
+        &ipParent &subParent &blockParent &getRoutedCity
         &allocateBlock &updateBlock &deleteBlock &getBlockData
         &getNodeList &getNodeName &getNodeInfo
@@ -43 +43 @@
                 &listSummary &listMaster &listRBlock &listFree &listPool
                 &getTypeList &getPoolSelect &findAllocateFrom
-                &getParent &getRoutedCity
+                &ipParent &subParent &blockParent &getRoutedCity
                 &allocateBlock &updateBlock &deleteBlock &getBlockData
                 &getNodeList &getNodeName &getNodeInfo
@@ -576 +576 @@
 
 
-## IPDB::getParent()
-# Get a block's parent's details
-# Takes a database handle and CIDR block
-# Returns a hashref to the parent routed or container block, if any
-sub getParent {
+## IPDB::ipParent()
+# Get an IP's parent pool's details
+# Takes a database handle and IP
+# Returns a hashref to the parent pool block, if any
+sub ipParent {
   my $dbh = shift;
   my $block = shift;
@@ -587 +587 @@
         " WHERE cidr >>= ?", undef, ($block) );
   return $pinfo;
-} # end getParent()
+} # end ipParent()
+
+
+## IPDB::subParent()
+# Get a block's parent's details
+# Takes a database handle and CIDR block
+# Returns a hashref to the parent container block, if any
+sub subParent {
+  my $dbh = shift;
+  my $block = shift;
+
+  my $pinfo = $dbh->selectrow_hashref("SELECT cidr,custid,type,city,description FROM allocations".
+        " WHERE cidr >>= ?", undef, ($block) );
+  return $pinfo;
+} # end subParent()
+
+
+## IPDB::blockParent()
+# Get a block's parent's details
+# Takes a database handle and CIDR block
+# Returns a hashref to the parent container block, if any
+sub blockParent {
+  my $dbh = shift;
+  my $block = shift;
+
+  my $pinfo = $dbh->selectrow_hashref("SELECT cidr,city FROM routed".
+        " WHERE cidr >>= ?", undef, ($block) );
+  return $pinfo;
+} # end blockParent()
 
 

trunk/cgi-bin/main.cgi

@@ -328 +328 @@
       # Snag the type of the container block from the database.
 ## hmm.  need a flag for parent class/type, sort of?
-      my $pblock = getParent($ip_dbh, $webvar{block});
+      my $pblock = subParent($ip_dbh, $webvar{block});
       my $ptype = $pblock->{type};
       $ptype =~ s/c$/r/;
@@ -616 +616 @@
 ##fixme:  hook to force-set POP or city on certain alloctypes
 # if ($webvar{alloctype =~ /foo,bar,bz/ { $webvar{pop} = 'blah'; }
-    if ($webvar{pop} =~ /^-$/) {
+    if ($webvar{pop} && $webvar{pop} =~ /^-$/) {
       $flag = 'to route the block from/through';
     }
@@ -722 +722 @@
   return if !validateInput;
 
+  $webvar{swip} = 'n' if !$webvar{swip};
+
   my %updargs = (
         custid          => $webvar{custid},
@@ -730 +732 @@
         block           => $webvar{block},
         type            => $webvar{alloctype},
+        swip            => $webvar{swip},
         );
 
@@ -760 +763 @@
 
   # Link back to browse-routed or list-pool page on "Update complete" page.
-  my $cblock;   # to contain the CIDR of the container block we're retrieving.
-  my $sql;
+  my $cblock;
   if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
     $page->param(backpool => 1);
-    $sql = "select pool from poolips where ip='$webvar{block}'";
+    $cblock = ipParent($ip_dbh, $webvar{block});
   } else {
-    $sql = "select cidr from routed where cidr >>= '$webvar{block}'";
-  }
-  # I define there to be no errors on this operation...  so we don't need to check for them.
-  $sth = $ip_dbh->prepare($sql);
-  $sth->execute;
-  $sth->bind_columns(\$cblock);
-  $sth->fetch();
-  $sth->finish;
-  $page->param(backblock => $cblock);
+    $cblock = blockParent($ip_dbh, $webvar{block});
+  }
+  $page->param(backblock => $cblock->{cidr});
+
+  # Do some HTML fiddling here instead of using ESCAPE=HTML in the template,
+  # because otherwise we can't convert \n to <br>.  *sigh*
+  $webvar{notes} = $q->escapeHTML($webvar{notes});      # escape first...
+  $webvar{notes} =~ s/\n/<br>\n/;                       # ... then convert newlines
+  $webvar{privdata} = ($webvar{privdata} ? $q->escapeHTML($webvar{privdata}) : "&nbsp;");
+  $webvar{privdata} =~ s/\n/<br>\n/;
 
   $page->param(cidr => $webvar{block});
@@ -781 +784 @@
   $page->param(custid => $webvar{custid});
   $page->param(swip => $webvar{swip} eq 'on' ? 'Yes' : 'No');
-  $page->param(circid => $q->escapeHTML($webvar{circid}));
-  $page->param(desc => $q->escapeHTML($webvar{desc}));
-  $page->param(notes => $q->escapeHTML($webvar{notes}));
-  $webvar{privdata} = ($webvar{privdata} ? $q->escapeHTML($webvar{privdata}) : "&nbsp;");
+  $page->param(circid => $webvar{circid});
+  $page->param(desc => $webvar{desc});
+  $page->param(notes => $webvar{notes});
   $page->param(privdata => $webvar{privdata})
         if $IPDBacl{$authuser} =~ /s/;

trunk/templates/update.tmpl

@@ -41 +41 @@
 <tr class="row0">
 <td>Circuit ID:</td>
-<td><TMPL_VAR NAME=circid></td>
+<td><TMPL_VAR ESCAPE=HTML NAME=circid></td>
 </tr>
 
 <tr class="row1">
 <td valign="top">Description/Name:</td>
-<td><TMPL_VAR NAME=desc></td>
+<td><TMPL_VAR ESCAPE=HTML NAME=desc></td>
 </tr>