X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/3d349b24ddccc0ce66b72de9d9fd4b4326d8fe75..8ae0d71896fa022dd80e5a5de993e1382564fcb1:/app/views/quickvote/results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index cba32d0..24a9beb 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,5 +1,4 @@
-<%  %>
-<%require 'IPAddr' %>
+<%require 'whois/whois' %>
 <h1>Results</h1>
 
 <% if @election.shortdesc %>
@@ -148,19 +147,27 @@ by several other names.</p>
 <h2>Voters</h2>
 <table class="voterbox">
 <tr>
-<th>IP Address</th>
-<th>DNS/Host</th>
+<th>IP/Host</th>
+<th>Origin</th>
 <th>Vote</th>
 </tr>
 <% for voter in @election.voters %>
   <% next unless voter.voted? %>
   <tr>
-  <td><%= voter.ipaddress %></td>
-  <td><% begin %>
-      <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %>
+    <td><% begin %>
+        <% raise ArgumentError.new, "Local Server" if voter.ipaddress == "127.0.0.1" %>
+        <% raise ArgumentError.new, "XML-RPC Voter" if voter.ipaddress == "XMLRPC Request" %>
+        <% w= Whois::Whois.new(IPAddr.new(voter.ipaddress).to_s,true)%>
+        <%=(w.host == nil or w.host.empty?) ? voter.ipaddress : w.host%>
+      </td>
+      <td>
+        <%w.search_whois%>
+        <%= (w.all.grep(/^(OrgName|org-name)/)[0] or "").sub(/^(OrgName|org-name)\:/,'').strip -%> - <%=  (w.all.grep(/^(NetName|netname)/)[0] or "").sub(/^(NetName|netname)\:/,'').strip %>
     
     <% rescue ArgumentError => err %>
-      <%= voter.ipaddress %>
+      <%= err %>
+    </td>
+    <td><%= err%>
     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>