X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/47fdfaba5a11570f2d7d720ee1c80d616d502c74..df1e1ca70a2c618eb376ea6b61207c726beac31d:/app/views/quickvote/results.rhtml diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index 9727d81..3ba74f5 100644 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -1,9 +1,12 @@ -<% %> -<%require 'whois/whois' %> -
Description:
+Vote Description:
<%=h @election.shortdesc %> <% if @election.longdesc -%>-
@@ -25,60 +28,20 @@ <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details)
IP/Host | -Origin | -Vote | -||
---|---|---|---|---|
<% 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),true)%> - <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%> - | -- <%w.search_whois%> - <%=h (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 %> - <%=h err %> - | -<%=h err%> - <% rescue NoMethodError %> - DNS Unreachable - | -DNS Unreachable - <% end %> - | -<%= voter.vote.votestring %> | -