Changeset 528

Timestamp:

10/24/12 16:34:36 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move SQL for static IP pool list to IPDB.pm. See #34.

• Rename listPool in main.cgi to showPool, so that we can:
• Add listPool sub in IPDB.pm
• Convert getBlockData to return a hashref instead of an array, and update the one extant call

Tweak template to use odd for row colors

Location:

trunk

Files:

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

trunk/cgi-bin/IPDB.pm

@@ -27 +27 @@
         &initIPDBGlobals &connectDB &finish &checkDBSanity
         &addMaster
-        &listSummary &listMaster &listRBlock &listFree
+        &listSummary &listMaster &listRBlock &listFree &listPool
         &getRoutedCity
         &allocateBlock &deleteBlock &getBlockData
@@ -40 +40 @@
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
                 &addMaster
-                &listSummary &listMaster &listRBlock &listFree
+                &listSummary &listMaster &listRBlock &listFree &listPool
                 &getRoutedCity
                 &allocateBlock &deleteBlock &getBlockData
@@ -443 +443 @@
   return \@flist;
 } # end listFree()
+
+
+## IPDB::listPool()
+#
+sub listPool {
+  my $dbh = shift;
+  my $pool = shift;
+
+  my $sth = $dbh->prepare("SELECT ip,custid,available,description,type".
+        " FROM poolips WHERE pool = ? ORDER BY ip");
+  $sth->execute($pool);
+  my @poolips;
+  while (my ($ip,$custid,$available,$desc,$type) = $sth->fetchrow_array) {
+    my %row = (
+        ip => $ip,
+        custid => $custid,
+        available => $available,
+        desc => $desc,
+        delme => $available eq 'n'
+        );
+    push @poolips, \%row;
+  }
+  return \@poolips;
+} # end listPool()
 
 
@@ -972 +996 @@
   my $block = shift;
 
-  my $sth = $dbh->prepare("select cidr,custid,type,city,description from searchme".
-        " where cidr='$block'");
-  $sth->execute();
-  return $sth->fetchrow_array();
+  my $binfo = $dbh->selectrow_hashref("SELECT cidr,custid,type,city,description FROM searchme".
+        " WHERE cidr = ?", undef, ($block) );
+  return $binfo;
 } # end getBlockData()
 

trunk/cgi-bin/main.cgi

@@ -129 +129 @@
 }
 elsif($webvar{action} eq 'listpool') {
-  listPool();
+  showPool();
 }
 
@@ -267 +267 @@
 
 # List the IPs used in a pool
-sub listPool {
+sub showPool {
 
   my $cidr = new NetAddr::IP $webvar{pool};
@@ -280 +280 @@
 
   # Snag pool info for heading
-  $sth = $ip_dbh->prepare("select type,city from allocations where cidr=?");
-  $sth->execute($webvar{pool});
-  my ($pooltype, $poolcity) = $sth->fetchrow_array;
-
-  $page->param(disptype => $disp_alloctypes{$pooltype});
-  $page->param(city => $poolcity);
+  my $poolinfo = getBlockData($ip_dbh, $webvar{pool});
+
+  $page->param(disptype => $disp_alloctypes{$poolinfo->{type}});
+  $page->param(city => $poolinfo->{city});
 
   # Only display net/gw/bcast if it's a "real" netblock and not a PPP(oE) lunacy
-  $page->param(realblock => $pooltype =~ /^.d$/);
+  $page->param(realblock => $poolinfo->{type} =~ /^.d$/);
 
 # probably have to add an "edit IP allocation" link here somewhere.
 
-  $sth = $ip_dbh->prepare("select ip,custid,available,description,type".
-        " from poolips where pool='$webvar{pool}' order by ip");
-  $sth->execute;
-  my @poolips;
-  my $rowclass = 0;
-  while (my ($ip,$custid,$available,$desc,$type) = $sth->fetchrow_array) {
-    my %row = (
-        rowclass => $rowclass++ % 2,
-        ip => $ip,
-        custid => $custid,
-        available => $available,
-        desc => $desc,
-        maydel => $IPDBacl{$authuser} =~ /d/,
-        delme => $available eq 'n'
-        );
-    push @poolips, \%row;
-  }
-  $page->param(poolips => \@poolips);
-
-} # end listPool
+  my $plist = listPool($ip_dbh, $webvar{pool});
+  # technically slightly more efficient to check the ACL in an if () once outside the foreach
+  foreach (@{$plist}) {
+    $$_{maydel} = $IPDBacl{$authuser} =~ /d/;
+  }
+  $page->param(poolips => $plist);
+} # end showPool
 
 
@@ -1038 +1023 @@
 
   # need to retrieve block data before deleting so we can notify on that
-  my ($cidr,$custid,$type,$city,$description) = getBlockData($ip_dbh, $webvar{block});
+  my $blockinfo = getBlockData($ip_dbh, $webvar{block});
 
   my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{alloctype});
@@ -1044 +1029 @@
   $page->param(block => $webvar{block});
   if ($code eq 'OK') {
-    syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block}".
-        " $custid, $city, desc='$description'";
+    syslog "notice", "$authuser deallocated '$webvar{alloctype}'-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".
-        "CustID: $custid\nCity: $city\nDescription: $description\n");
+        "CustID: ".$blockinfo->{custid}."\nCity: ".$blockinfo->{city}.
+        "\nDescription: ".$blockinfo->{description}."\n");
   } else {
     $page->param(failmsg => $msg);

trunk/templates/listpool.tmpl

@@ -28 +28 @@
 
 <TMPL_LOOP name=poolips>
-<tr class="row<TMPL_VAR NAME=rowclass>">
+<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
 <td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=ip>"><TMPL_VAR NAME=ip></a></td>
 <td><TMPL_VAR NAME=custid></td>