X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/df81b74ceb3e11d9de2e523bf93c6c69d5da1dfb..f34ba9161af59132af409d507a3a16720e1ffdd0:/app/views/quickvote/results.rhtml?ds=inline

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index a2b1206..f53bf3f 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -158,10 +158,11 @@ by several other names.</p>
         <% 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%>
+        <%=(w.host == nil or w.host.empty?) ? voter.ipaddress : w.host%>
       </td>
-  <td>
-      <%= w.search_whois.grep(/^OrgName/)[0].sub(/^OrgName\:/,'').strip %>
+      <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 %>
       <%= err %>