Changeset 538 for trunk

Timestamp:

11/01/12 16:28:15 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Remove SQL in favour of calls to existing subs on delete confirmation
page. See #34.
Tweak template to remove a stale form variable and tighten
HTML-entities escaping on delete confirmation page. See #3.

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (1 diff)
• templates/delete.tmpl (modified) (3 diffs)

trunk/cgi-bin/main.cgi

@@ -806 +806 @@
   }
 
-  my ($cidr, $custid, $type, $city, $circid, $desc, $notes, $alloctype, $privdata);
+  my $blockdata;
 
   if ($webvar{alloctype} eq 'rm') {
-    $sth = $ip_dbh->prepare("select cidr,city from routed where cidr='$webvar{block}'");
-    $sth->execute();
-
-# This feels...  extreme.
-    croak $sth->errstr() if($sth->errstr());
-
-    $sth->bind_columns(\$cidr,\$city);
-    $sth->execute();
-    $sth->fetch || croak $sth->errstr();
-    $custid = "N/A";
-    $alloctype = $webvar{alloctype};
-    $circid = "N/A";
-    $desc = "N/A";
-    $notes = "N/A";
-    $privdata = "N/A";
+
+    $blockdata->{block} = $webvar{block};
+    $blockdata->{city} = getRoutedCity($ip_dbh, $webvar{block});
+    $blockdata->{custid} = "N/A";
+    $blockdata->{type} = $webvar{alloctype};
+    $blockdata->{circuitid} = "N/A";
+    $blockdata->{description} = "N/A";
+    $blockdata->{notes} = "N/A";
+    $blockdata->{privdata} = "N/A";
 
   } elsif ($webvar{alloctype} eq 'mm') {
 
-    $cidr = $webvar{block};
-    $city = "N/A";
-    $custid = "N/A";
-    $alloctype = $webvar{alloctype};
-    $circid = "N/A";
-    $desc = "N/A";
-    $notes = "N/A";
-    $privdata = "N/A";
-
-  } elsif ($webvar{alloctype} =~ /^.i$/) { # done with alloctype=[rm]m
-
-    # Unassigning a static IP
-    my $sth = $ip_dbh->prepare("select ip,custid,city,type,notes,circuitid,privdata".
-        " from poolips where ip='$webvar{block}'");
-    $sth->execute();
-#  croak $sth->errstr() if($sth->errstr());
-
-    $sth->bind_columns(\$cidr, \$custid, \$city, \$alloctype, \$notes, \$circid,
-        \$privdata);
-    $sth->fetch() || croak $sth->errstr;
-
-  } else { # done with alloctype=~ /^.i$/
-
-    my $sth = $ip_dbh->prepare("select cidr,custid,type,city,circuitid,description,notes,privdata".
-        " from allocations where cidr='$webvar{block}'");
-    $sth->execute();
-#       croak $sth->errstr() if($sth->errstr());
-
-    $sth->bind_columns(\$cidr, \$custid, \$alloctype, \$city, \$circid, \$desc,
-        \$notes, \$privdata);
-    $sth->fetch() || carp $sth->errstr;
+    $blockdata->{block} = $webvar{block};
+    $blockdata->{city} = "N/A";
+    $blockdata->{custid} = "N/A";
+    $blockdata->{type} = $webvar{alloctype};
+    $blockdata->{circuitid} = "N/A";
+    $blockdata->{description} = "N/A";
+    $blockdata->{notes} = "N/A";
+    $blockdata->{privdata} = "N/A";
+
+  } else {
+
+    $blockdata = getBlockData($ip_dbh, $webvar{block})
+
   } # end cases for different alloctypes
 
-  $page->param(block => $cidr);
-  $page->param(disptype => $disp_alloctypes{$alloctype});
-  $page->param(type => $alloctype);
-  $page->param(city => $city);
-  $page->param(custid => $custid);
-  $page->param(circid => $circid);
-  $page->param(desc => $desc);
-  $page->param(notes => $notes);
-  $privdata = ' ' if $privdata eq '';
-  $page->param(privdata => $privdata) if $IPDBacl{$authuser} =~ /s/;
-  $page->param(delpool => $alloctype =~ /^.[pd]$/);
+  $page->param(block => $blockdata->{block});
+  $page->param(disptype => $disp_alloctypes{$blockdata->{type}});
+  $page->param(type => $blockdata->{type});
+  $page->param(city => $blockdata->{city});
+  $page->param(custid => $blockdata->{custid});
+  $page->param(circid => $blockdata->{circuitid});
+  $page->param(desc => $blockdata->{description});
+  $blockdata->{notes} = $q->escapeHTML($blockdata->{notes});
+  $blockdata->{notes} =~ s/\n/<br>\n/;
+  $page->param(notes => $blockdata->{notes});
+  $blockdata->{privdata} = $q->escapeHTML($blockdata->{privdata});
+  $blockdata->{privdata} = '&nbsp;' if $blockdata->{privdata} eq '';
+  $blockdata->{privdata} =~ s/\n/<br>\n/;
+  $page->param(privdata => $blockdata->{privdata}) if $IPDBacl{$authuser} =~ /s/;
+  $page->param(delpool => $blockdata->{type} =~ /^.[pd]$/);
 
 } # end remove()

trunk/templates/delete.tmpl

@@ -27 +27 @@
 <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>
 
@@ -42 +42 @@
 <TMPL_IF privdata>
 <tr class="row1">
-<td>Restricted data:</td>
+<td valign="top">Restricted data:</td>
 <td><TMPL_VAR NAME=privdata></td>
 </tr>
@@ -60 +60 @@
 <input type="button" value="Back" onclick="history.go(-1)"><input type="submit" value="Confirm">
 <input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
-<input type="hidden" name="city" value="<TMPL_VAR NAME=city>">
 <input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
 <input type="hidden" name="action" value="finaldelete">