From: John Dong Date: Thu, 16 Aug 2007 20:11:31 +0000 (-0400) Subject: * Display DNS instead of IP address X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/df81b74ceb3e11d9de2e523bf93c6c69d5da1dfb * Display DNS instead of IP address * Convert old DNS field to WHOIS OrganizationName field. * Btter handle invalid IP's, including proper display of XMLRPC voters --- diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index 1df2856..a2b1206 100644 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -147,20 +147,26 @@ by several other names.

Voters

- - + + <% for voter in @election.voters %> <% next unless voter.voted? %> - - + +
IP AddressDNS/HostIP/HostOrigin Vote
<%= voter.ipaddress %><% begin %> - <% raise ArgumentError.new if voter.ipaddress == "127.0.0.1" %> - <%= Whois::Whois.new(IPAddr.new(voter.ipaddress).to_s).search_whois.grep(/^OrgName/)[0].sub(/^OrgName\:/,'').strip %> + <% 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%> + + <%= w.search_whois.grep(/^OrgName/)[0].sub(/^OrgName\:/,'').strip %> <% rescue ArgumentError => err %> - <%= voter.ipaddress %> + <%= err %> + <%= err%> <% end %> <%= voter.vote.votestring %>