X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/597c27db39d8b36e623a9d6573e75edf657142c0..f0a07fead89d29513f76ee42b29a0f87dbe926d6:/app/views/quickvote/results.rhtml diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index 98a71e5..0cbd6d0 100644 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -1,4 +1,4 @@ -<%require 'IPAddr' %> +<%require 'whois/whois' %>
IP Address | -DNS/Host | +IP/Host | +Origin | Vote | |
---|---|---|---|---|---|
<%= voter.ipaddress %> | -<% begin %> - <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %> + | <% 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%> + | ++ <%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 %> + | +<%= err%> <% end %> | <%= voter.vote.votestring %> | @@ -168,8 +175,10 @@ by several other names. <% end %>