Changeset 466 for branches/htmlform/cgi-bin

Timestamp:

08/12/10 11:52:22 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Give up on proper spelling of "centre" in CSS class names and
defs - browsers only understand an alignment of "center".
Adjust width of some <hr>'s
Visual row0/row1 classes got switched somehow, somewhere
Remove legacy "color0/color1/color2" row class defs
Convert showrouted to template
See #3.

File:

• branches/htmlform/cgi-bin/main.cgi (modified) (2 diffs)

branches/htmlform/cgi-bin/main.cgi

@@ -417 +417 @@
   $sth = $ip_dbh->prepare("select city from routed where cidr='$master'");
   $sth->execute;
-  my @data = $sth->fetchrow_array;
-
-  print qq(<center><div class="heading">Summarizing allocated blocks for ).
-        qq($master ($data[0]):</div></center><br>\n);
-
-  startTable('CIDR allocation','Customer Location','Type','CustID','SWIPed?','Description/Name');
+  my ($rcity) = $sth->fetchrow_array;
+
+  $page->param(master => "$master");
+  $page->param(rcity => $rcity);
 
   # Snag the allocations for this block
@@ -433 +431 @@
   my $custsth = $ip_dbh->prepare("select count(*) from customers where custid=?");
 
-  my $count=0;
-  while (my @data = $sth->fetchrow_array()) {
-    # cidr,city,type,custid,swip,description, as per the SELECT
-    my $cidr = new NetAddr::IP $data[0];
-
-    # Clean up extra spaces that are borking things.
-#    $data[2] =~ s/\s+//g;
-
-    $custsth->execute($data[3]);
+  my $rowclass = 0;
+  my @blocklist;
+  while (my ($cidr,$city,$type,$custid,$swip,$desc) = $sth->fetchrow_array()) {
+    $custsth->execute($custid);
     my ($ncust) = $custsth->fetchrow_array();
 
-    # Prefix subblocks with "Sub "
-    my @row = ( (($data[2] =~ /^.r$/) ? 'Sub ' : '').
-        qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
-        $data[1], $disp_alloctypes{$data[2]}, $data[3], 
-        ($data[4] eq 'y' ? ($ncust == 0 ? 'Yes<small>*</small>' : 'Yes') : 'No'), $data[5]);
-    # If the allocation is a pool, allow listing of the IPs in the pool.
-    if ($data[2] =~ /^.[pd]$/) {
-      $row[0] .= ' &nbsp; <a href="/ip/cgi-bin/main.cgi?action=listpool'.
-        "&pool=$data[0]\">List IPs</a>";
-    }
-
-    printRow(\@row, 'color1') if ($count%2 == 0);
-    printRow(\@row, 'color2') if ($count%2 != 0);
-    $count++;
-  }
-
-  print "</table>\n";
-
-  # If the routed block has no allocations, by definition it only has
-  # one free block, and therefore may be deleted.
-  if ($count == 0) {
-    print qq(<hr width="60%"><center><div class="heading">No allocations in ).
-        qq($master.</div></center>\n).
-        ($IPDBacl{$authuser} =~ /d/ ?
-                qq(<form action="/ip/cgi-bin/main.cgi" method=POST>\n).
-                qq(<input type=hidden name=action value="delete">\n).
-                qq(<input type=hidden name=block value="$master">\n).
-                qq(<input type=hidden name=alloctype value="rm">\n).
-                qq(<input type=submit value=" Remove this block ">\n).
-                qq(</form>\n) :
-                '');
-  }
-
-  print qq(<hr width="60%">\n<center><div class="heading">Free blocks within routed ).
-        qq(submaster $master</div></center>\n);
-
-  startTable('CIDR block','Range');
+    my %row = (
+        rowclass => $rowclass++ % 2,
+        block => $cidr,
+        city => $city,
+        type => $disp_alloctypes{$type},
+        custid => $custid,
+        swip => ($swip eq 'y' ? ($ncust == 0 ? 'Yes<small>*</small>' : 'Yes') : 'No'),
+        desc => $desc
+        );
+    $row{subblock} = ($type =~ /^.r$/);         # hmf.  wonder why these won't work in the hash declaration...
+    $row{listpool} = ($type =~ /^.[pd]$/);
+    push (@blocklist, \%row);
+  }
+  $page->param(blocklist => \@blocklist);
+
+  $page->param(delrouted => $IPDBacl{$authuser} =~ /d/);
 
   # Snag the free blocks.  We don't really *need* to be pedantic about avoiding
   # unrouted free blocks, but it's better to let the database do the work if we can.
-  $count = 0;
+  $rowclass = 0;
+  my @unassigned;
   $sth = $ip_dbh->prepare("select cidr,routed from freeblocks where cidr <<= '$master'".
         " order by cidr");
   $sth->execute();
-  while (my @data = $sth->fetchrow_array()) {
-    # cidr,routed
-    my $cidr = new NetAddr::IP $data[0];
-    # Include some HairyPerl(TM) to prefix subblocks with "Sub "
-    my @row = ((($data[1] ne 'y' && $data[1] ne 'n') ? 'Sub ' : '').
-        ($IPDBacl{$authuser} =~ /a/ ? qq(<a href="/ip/cgi-bin/main.cgi?action=assign&block=$cidr&fbtype=$data[1]">$cidr</a>) : $cidr),
-        $cidr->range);
-    printRow(\@row, 'color1') if ($count%2 == 0);
-    printRow(\@row, 'color2') if ($count%2 != 0);
-    $count++;
-  }
-
-  print "</table>\n";
+  while (my ($cidr_db,$routed) = $sth->fetchrow_array()) {
+    my $cidr = new NetAddr::IP $cidr_db;
+
+    my %row = (
+        rowclass => $rowclass++ % 2,
+        subblock => ($routed ne 'y' && $routed ne 'n'),
+        fblock => $cidr_db,
+        fbtype => $routed,
+        frange => $cidr->range,
+        );
+    push @unassigned, \%row;
+  }
+  $page->param(unassigned => \@unassigned);
+
 } # showRBlock