Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/Misc/Geo.pm
index d9dcf3f,c6d6f1f..6bd817c
--- 1/FS/FS/Misc/Geo.pm
--- 2/FS/FS/Misc/Geo.pm
+++ b/FS/FS/Misc/Geo.pm
@@@ -6,6 -6,7 +6,7 @@@ use vars qw( $DEBUG @EXPORT_OK $conf )
  use LWP::UserAgent;
  use HTTP::Request;
  use HTTP::Request::Common qw( GET POST );
+ use HTTP::Cookies;
  use HTML::TokeParser;
  use URI::Escape 3.31;
  use Data::Dumper;
@@@ -48,19 -49,20 +49,20 @@@ sub get_censustract_ffiec 
    my $return = {};
    my $error = '';
  
-   my $ua = new LWP::UserAgent;
+   my $ua = new LWP::UserAgent('cookie_jar' => HTTP::Cookies->new);
    my $res = $ua->request( GET( $url ) );
  
    warn $res->as_string
      if $DEBUG > 2;
  
-   unless ($res->code  eq '200') {
+   if (!$res->is_success) {
  
      $error = $res->message;
  
    } else {
  
      my $content = $res->content;
+ 
      my $p = new HTML::TokeParser \$content;
      my $viewstate;
      my $eventvalidation;
@@@ -74,7 -76,7 +76,7 @@@
        last if $viewstate && $eventvalidation;
      }
  
-     unless ($viewstate && $eventvalidation ) {
+     if (!$viewstate or !$eventvalidation ) {
  
        $error = "either no __VIEWSTATE or __EVENTVALIDATION found";
  
@@@ -82,10 -84,11 +84,11 @@@
  
        my($zip5, $zip4) = split('-',$location->{zip});
  
 -      $year ||= '2012';
 +      $year ||= '2013';
        my @ffiec_args = (
          __VIEWSTATE => $viewstate,
          __EVENTVALIDATION => $eventvalidation,
+         __VIEWSTATEENCRYPTED => '',
          ddlbYear    => $year,
          txtAddress  => $location->{address1},
          txtCity     => $location->{city},