Changeset 471

Timestamp:

08/17/10 16:33:43 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Convert listpool to template. See #3.

Location:

branches/htmlform

Files:

• cgi-bin/main.cgi (modified) (1 diff)
• templates/listpool.tmpl (added)

branches/htmlform/cgi-bin/main.cgi

@@ -483 +483 @@
   my $cidr = new NetAddr::IP $webvar{pool};
 
-  my ($pooltype,$poolcity);
+  $page->param(block => $webvar{pool});
+  $page->param(netip => $cidr->addr);
+  $cidr++;
+  $page->param(gate => $cidr->addr);
+  $cidr--;  $cidr--;
+  $page->param(bcast => $cidr->addr);
+  $page->param(mask => $cidr->mask);
 
   # Snag pool info for heading
-  $sth = $ip_dbh->prepare("select type,city from allocations where cidr='$cidr'");
-  $sth->execute;
-  $sth->bind_columns(\$pooltype, \$poolcity);
-  $sth->fetch() || carp $sth->errstr;
-
-  print qq(<center><div class="heading">Listing pool IPs for $cidr<br>\n).
-        qq(($disp_alloctypes{$pooltype} in $poolcity)</div></center><br>\n);
+  $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);
+
+#  print qq(<center><div class="heading">Listing pool IPs for $cidr<br>\n).
+#       qq(($disp_alloctypes{$pooltype} in $poolcity)</div></center><br>\n);
   # Only display net/gw/bcast if it's a "real" netblock and not a PPP(oE) lunacy
-  if ($pooltype =~ /^.d$/) {
-    print qq(<div class="indent"><b>Reserved IPs:</b><br>\n);
-    print qq(<div class="indent"><table><tr class=color1><td>Network IP:</td><td>).
-        $cidr->addr."</td></tr>\n";
-    $cidr++;
-    print "<tr class=color2><td>Gateway:</td><td>".$cidr->addr."</td></tr>\n";
-    $cidr--;  $cidr--;
-    print "<tr class=color1><td>Broadcast:</td><td>".$cidr->addr."</td></tr>\n".
-        "<tr><td>Netmask:</td><td>".$cidr->mask."</td></tr>\n".
-        "</table></div></div>\n";
-  }
+  $page->param(realblock => $pooltype =~ /^.d$/);
 
 # probably have to add an "edit IP allocation" link here somewhere.
 
-  startTable('IP','Customer ID','Available?','Description','');
   $sth = $ip_dbh->prepare("select ip,custid,available,description,type".
         " from poolips where pool='$webvar{pool}' order by ip");
   $sth->execute;
-  my $count = 0;
-  while (my @data = $sth->fetchrow_array) {
-    # pool,ip,custid,city,ptype,available,notes,description,circuitid
-    # ip,custid,available,description,type
-    # If desc is "null", make it not null.  <g>
-    if ($data[3] eq '') {
-      $data[3] = '&nbsp;';
-    }
-    # Some nice hairy Perl to decide whether to allow unassigning each IP
-    #   -> if $data[2] (aka poolips.available) == 'n' then we print the unassign link
-    #      else we print a blank space
-    my @row = ( qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
-        $data[1],$data[2],$data[3],
-        ( (($data[2] eq 'n') && ($IPDBacl{$authuser} =~ /d/)) ?
-          ("<a href=\"/ip/cgi-bin/main.cgi?action=delete&block=$data[0]&".
-           "alloctype=$data[4]\">Unassign this IP</a>") :
-          ("&nbsp;") )
+  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'
         );
-    printRow(\@row, 'color1') if($count%2==0);
-    printRow(\@row, 'color2') if($count%2!=0);
-    $count++;
-  }
-  print "</table>\n";
+    push @poolips, \%row;
+  }
+  $page->param(poolips => \@poolips);
 
 } # end listPool