remove obsolete netscape CCK support

[freeside.git] / fs_signup / FS-SignupClient / cgi / signup.cgi

diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 70facb5..0a9a510 100755 (executable)
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.47 2003-10-24 19:28:49 ivan Exp $
+# $Id: signup.cgi,v 1.50 2004-01-04 03:52:54 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $locales $packages
@@ -10,8 +10,8 @@ use vars qw( @payby $cgi $locales $packages
              $country $zip $daytime $night $fax $invoicing_list $payby $payinfo
              $paycvv $paydate $payname $referral_custnum $init_popstate
              $pkgpart $username $password $password2 $sec_phrase $popnum
-             $agentnum
-             $ieak_file $ieak_template $cck_file $cck_template
+             $agentnum $refnum
+             $ieak_file $ieak_template
              $signup_html $signup_template
              $success_html $success_template
              $decline_html $decline_template
@@ -26,7 +26,7 @@ use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
 use Text::Template;
 use Business::CreditCard;
-use HTTP::Headers::UserAgent 2.00;
+use HTTP::BrowserDetect;
 use FS::SignupClient 0.03 qw( signup_info new_customer );
 
 #acceptable payment methods
@@ -37,7 +37,6 @@ use FS::SignupClient 0.03 qw( signup_info new_customer );
 @payby = qw( CARD PREPAY );
 
 $ieak_file = '/usr/local/freeside/ieak.template';
-$cck_file = '/usr/local/freeside/cck.template';
 $signup_html = -e 'signup.html'
                  ? 'signup.html'
                  : '/usr/local/freeside/signup.html';
@@ -62,17 +61,6 @@ if ( -e $ieak_file ) {
   $ieak_template = '';
 }
 
-if ( -e $cck_file ) {
-  my $cck_txt = Text::Template::_load_text($cck_file)
-    or die $Text::Template::ERROR;
-  $cck_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $cck_txt = $1;
-  $cck_template = new Text::Template ( TYPE => 'STRING', SOURCE => $cck_txt )
-    or die $Text::Template::ERROR;
-} else {
-  $cck_template = '';
-}
-
 $agentnum = '';
 if ( -e $signup_html ) {
   my $signup_txt = Text::Template::_load_text($signup_html)
@@ -218,6 +206,7 @@ if ( defined $cgi->param('magic') ) {
     #$agentnum, #         = $cgi->param('agentnum'),
     $agentnum         ||= $cgi->param('agentnum');
     $init_popstate    = $cgi->param('init_popstate');
+    $refnum           = $cgi->param('refnum');
 
     if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
       $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
@@ -266,6 +255,8 @@ if ( defined $cgi->param('magic') ) {
         '_password'        => $password,
         'popnum'           => $popnum,
         'agentnum'         => $agentnum,
+        'refnum'           => $refnum,
+        map { $_ => $cgi->param($_) } grep { /^snarf_/ } $cgi->param
       } );
 
     }
@@ -273,6 +264,9 @@ if ( defined $cgi->param('magic') ) {
     if ( $error eq '_decline' ) {
       print_decline();
     } elsif ( $error ) {
+      #fudge the snarf info
+      no strict 'refs';
+      ${$_} = $cgi->param($_) foreach grep { /^snarf_/ } $cgi->param;
       print_form();
     } else {
       print_okay();
@@ -310,6 +304,7 @@ if ( defined $cgi->param('magic') ) {
   $popnum = '';
   $referral_custnum = $cgi->param('ref') || '';
   $init_popstate = $cgi->param('init_popstate') || '';
+  $refnum = $init_data->{'refnum'};
   print_form;
 }
 
@@ -332,7 +327,7 @@ sub print_decline {
 }
 
 sub print_okay {
-  my $user_agent = new HTTP::Headers::UserAgent $ENV{HTTP_USER_AGENT};
+  my $user_agent = new HTTP::BrowserDetect $ENV{HTTP_USER_AGENT};
 
   $cgi->param('username') =~ /^(.+)$/
     or die "fatal: invalid username got past FS::SignupClient::new_customer";
@@ -355,27 +350,10 @@ sub print_okay {
   #global for template
   $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'};
 
-  if ( $ieak_template
-       && $user_agent->platform eq 'ia32'
-       && $user_agent->os =~ /^win/
-       && ($user_agent->browser)[0] eq 'IE'
-     )
-  { #send an IEAK config
+  if ( $ieak_template && $user_agent->windows && $user_agent->ie ) {
+    #send an IEAK config
     print $cgi->header('application/x-Internet-signup'),
           $ieak_template->fill_in();
-  } elsif ( $cck_template
-            && $user_agent->platform eq 'ia32'
-            && $user_agent->os =~ /^win/
-            && ($user_agent->browser)[0] eq 'Netscape'
-          )
-  { #send a Netscape config
-    my $cck_data = $cck_template->fill_in();
-    print $cgi->header('application/x-netscape-autoconfigure-dialer-v2'),
-          map {
-            m/(.*)\s+(.*)$/;
-            pack("N", length($1)). $1. pack("N", length($2)). $2;
-          } split(/\n/, $cck_data);
-
   } else { #send a simple confirmation
     print $cgi->header( '-expires' => 'now' ),
           $success_template->fill_in();