X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/924aa1ff433ac4ccd2db5851e91038088be00a09..df81b74ceb3e11d9de2e523bf93c6c69d5da1dfb:/app/views/quickvote/results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 5626636..a2b1206 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,4 +1,4 @@
-<%require 'IPAddr' %>
+<%require 'whois/whois' %>
 <h1>Results</h1>
 
 <% if @election.shortdesc %>
@@ -147,19 +147,26 @@ 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?) ? "Unknown voter" : w.host%>
+      </td>
+  <td>
+      <%= w.search_whois.grep(/^OrgName/)[0].sub(/^OrgName\:/,'').strip %>
     
     <% rescue ArgumentError => err %>
-      <%= " - " %>
+      <%= err %>
+    </td>
+    <td><%= err%>
     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>