Added a check to make sure a voter has a valid email address before attempting ot...

[selectricity] / app / views / quickvote / list_voters.rhtml

diff --git a/app/views/quickvote/list_voters.rhtml b/app/views/quickvote/list_voters.rhtml
index be11290b444cad0bb0bbb0258b4e264bb60343ee..b0dc6dd96768b6662768d25bb3fad0bc17e29654 100644 (file)
--- a/app/views/quickvote/list_voters.rhtml
+++ b/app/views/quickvote/list_voters.rhtml
@@ -27,14 +27,10 @@
             voter.ipaddress =~ /^172\.[1-3]/
             %>
             <% w=nil
             voter.ipaddress =~ /^172\.[1-3]/
             %>
             <% w=nil

-            puts "WHOIS #{voter.ipaddress}"
-            if Cache and w=Cache.get("WHOIS:#{voter.ipaddress}")
-            elsif Cache
-              puts "CREATE"
+            if defined? Cache and w=Cache.get("WHOIS:#{voter.ipaddress}")
+            elsif defined? Cache

               w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)
               w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)

-              puts "SEARCH"

               w.search_whois
               w.search_whois

-              puts "DONE"

               Cache.set("WHOIS:#{voter.ipaddress}", w)
             else
               w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)
               Cache.set("WHOIS:#{voter.ipaddress}", w)
             else
               w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)


@@ -42,11 +38,11 @@
             end
             
             %>
             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)%>

       </td>
       <td>
         <%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 %>
       </td>
       <td>
         <%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) %>
           <%= "No additional information" %>
         <% else %>
           <%= h(org) %>