X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/308308e1afb8402f351d2aa2a64d27eb5b596e17..dfefbfcd5664f972c7a0d7deb53b8eaa683d4c81:/app/views/quickvote/list_voters.rhtml?ds=sidebyside diff --git a/app/views/quickvote/list_voters.rhtml b/app/views/quickvote/list_voters.rhtml index ea276d7..b0dc6dd 100644 --- a/app/views/quickvote/list_voters.rhtml +++ b/app/views/quickvote/list_voters.rhtml @@ -27,8 +27,8 @@ voter.ipaddress =~ /^172\.[1-3]/ %> <% w=nil - if Cache and w=Cache.get("WHOIS:#{voter.ipaddress}") - elsif Cache + if defined? Cache and w=Cache.get("WHOIS:#{voter.ipaddress}") + elsif defined? Cache w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true) w.search_whois Cache.set("WHOIS:#{voter.ipaddress}", w) @@ -38,11 +38,11 @@ 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.reverse.slice(0,30).reverse)%> <%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 =~ /IANA/ %> + <% if org =~ /asdfasdf/ %> <%= "No additional information" %> <% else %> <%= h(org) %>