Display same in hostname and IP when IP lookup fails

[selectricity] / app / views / quickvote / results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 1fad7ea36a907186d565ff633e7877b0fe1613b6..9677d9ac0ae307e2ab7d102da2827b5e4a516220 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,4 +1,4 @@
-<% %>
+<%require 'IPAddr' %>

 <h1>Results</h1>
 
 <% if @election.shortdesc %>
 <h1>Results</h1>
 
 <% if @election.shortdesc %>


@@ -156,7 +156,13 @@ by several other names.</p>
   <% next unless voter.voted? %>
   <tr>
   <td><%= voter.ipaddress %></td>
   <% next unless voter.voted? %>
   <tr>
   <td><%= voter.ipaddress %></td>

-  <td><%= `host #{voter.ipaddress}`.sub(/^.*pointer (.*)\.$/, '\1') %></td>
+  <td><% begin %>
+      <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %>
+    
+    <% rescue ArgumentError => err %>
+      <%= voter.ipaddress %>
+    <% end %>
+    </td>

   <td><%= voter.vote.votestring %></td>
   </tr>
 <% end %>
   <td><%= voter.vote.votestring %></td>
   </tr>
 <% end %>