X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/f38aa87edf153cf8f5f5c93a78fbf1424a8e62f2..f95bdca9d25333308ef2f0c80eb2011f42d4a5eb:/app/views/quickvote/list_voters.rhtml diff --git a/app/views/quickvote/list_voters.rhtml b/app/views/quickvote/list_voters.rhtml index 695794f..4d8e538 100644 --- a/app/views/quickvote/list_voters.rhtml +++ b/app/views/quickvote/list_voters.rhtml @@ -1,5 +1,5 @@ <%= GMap.header %> - +<%require('whois/whois') %>
Quickvote Voters @@ -27,25 +27,26 @@ voter.ipaddress =~ /^172\.[1-3]/ %> <% w=nil - puts "WHOIS #{voter.ipaddress}" if Cache and w=Cache.get("WHOIS:#{voter.ipaddress}") elsif Cache - puts "CREATE" - w= Whois::Whois.new(IPAddr.new(voter.ipaddress),false) - puts "SEARCH" + w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true) w.search_whois - puts "DONE" Cache.set("WHOIS:#{voter.ipaddress}", w) else - w= Whois::Whois.new(IPAddr.new(voter.ipaddress),false) + w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true) w.search_whois end %> - <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%> + <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host[-30..-1])%> - <%=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 %> + <%org=(w.all.grep(/^(OrgName|org-name)/)[0] or "").sub(/^(OrgName|org-name)\:/,'').strip+" - "+ (w.all.grep(/^(NetName|netname)/)[0] or "").sub(/^(NetName|netname)\:/,'').strip %> + <% if org =~ /asdfasdf/ %> + <%= "No additional information" %> + <% else %> + <%= h(org) %> + <% end %> <% rescue ArgumentError => err %> <%=h err %>