From a6cbda0b7e6779b89abc1d466af9c3a880d8e030 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Mar 2005 14:35:12 +0000
Subject: [PATCH] - bring prepaid support into this century (close: Bug#1124) -
 finally get rid of fs_signup (everything is in fs_selfservice now) (Bug#413)
 - organize main menu sysadmin section so it is slightly less confusing

---
 fs_selfservice/FS-SelfService/cgi/signup.cgi       |  98 +---
 fs_selfservice/FS-SelfService/cgi/signup.html      |   9 +-
 .../FS-SelfService}/cgi/stateselect.html           |   0
 .../FS-SelfService}/cgi/success.html               |   0
 fs_signup/FS-SignupClient/Changes                  |   5 -
 fs_signup/FS-SignupClient/MANIFEST                 |   7 -
 fs_signup/FS-SignupClient/MANIFEST.SKIP            |   1 -
 fs_signup/FS-SignupClient/Makefile.PL              |  17 -
 fs_signup/FS-SignupClient/SignupClient.pm          | 209 ---------
 fs_signup/FS-SignupClient/cgi/cvv2.html            |  25 -
 fs_signup/FS-SignupClient/cgi/cvv2.png             | Bin 3854 -> 0 bytes
 fs_signup/FS-SignupClient/cgi/cvv2_amex.png        | Bin 4573 -> 0 bytes
 fs_signup/FS-SignupClient/cgi/decline.html         |   5 -
 fs_signup/FS-SignupClient/cgi/map.gif              | Bin 8181 -> 0 bytes
 fs_signup/FS-SignupClient/cgi/promocode.html       |  14 -
 fs_signup/FS-SignupClient/cgi/regcode.html         |  14 -
 .../FS-SignupClient/cgi/signup-agentselect.html    | 195 --------
 .../FS-SignupClient/cgi/signup-alternate.html      | 218 ---------
 .../FS-SignupClient/cgi/signup-billaddress.html    | 307 -------------
 .../FS-SignupClient/cgi/signup-freeoption.html     | 262 -----------
 fs_signup/FS-SignupClient/cgi/signup-snarf.html    | 228 ----------
 fs_signup/FS-SignupClient/cgi/signup.cgi           | 505 ---------------------
 fs_signup/FS-SignupClient/cgi/signup.html          | 224 ---------
 fs_signup/FS-SignupClient/test.pl                  |  20 -
 fs_signup/cck.template                             |  14 -
 fs_signup/fs_signup_server                         | 289 ------------
 fs_signup/ieak.template                            |  40 --
 htetc/global.asa                                   |   1 +
 htetc/handler.pl                                   |   1 +
 29 files changed, 9 insertions(+), 2699 deletions(-)
 rename {fs_signup/FS-SignupClient => fs_selfservice/FS-SelfService}/cgi/stateselect.html (100%)
 rename {fs_signup/FS-SignupClient => fs_selfservice/FS-SelfService}/cgi/success.html (100%)
 delete mode 100644 fs_signup/FS-SignupClient/Changes
 delete mode 100644 fs_signup/FS-SignupClient/MANIFEST
 delete mode 100644 fs_signup/FS-SignupClient/MANIFEST.SKIP
 delete mode 100644 fs_signup/FS-SignupClient/Makefile.PL
 delete mode 100644 fs_signup/FS-SignupClient/SignupClient.pm
 delete mode 100644 fs_signup/FS-SignupClient/cgi/cvv2.html
 delete mode 100644 fs_signup/FS-SignupClient/cgi/cvv2.png
 delete mode 100644 fs_signup/FS-SignupClient/cgi/cvv2_amex.png
 delete mode 100644 fs_signup/FS-SignupClient/cgi/decline.html
 delete mode 100644 fs_signup/FS-SignupClient/cgi/map.gif
 delete mode 100644 fs_signup/FS-SignupClient/cgi/promocode.html
 delete mode 100644 fs_signup/FS-SignupClient/cgi/regcode.html
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup-agentselect.html
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup-alternate.html
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup-billaddress.html
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup-freeoption.html
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup-snarf.html
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup.cgi
 delete mode 100755 fs_signup/FS-SignupClient/cgi/signup.html
 delete mode 100644 fs_signup/FS-SignupClient/test.pl
 delete mode 100644 fs_signup/cck.template
 delete mode 100755 fs_signup/fs_signup_server
 delete mode 100755 fs_signup/ieak.template

diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi
index afae1f167..d2ad0d64b 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -T
 #!/usr/bin/perl -Tw
 #
-# $Id: signup.cgi,v 1.1 2005-03-12 14:31:50 ivan Exp $
+# $Id: signup.cgi,v 1.2 2005-03-12 14:35:12 ivan Exp $
 
 use strict;
 use vars qw( @payby $cgi $init_data
@@ -12,24 +12,7 @@ use vars qw( @payby $cgi $init_data
              $success_html $success_template
              $decline_html $decline_template
            );
-             #$locales $packages
-             #$pops %pop %popnum2pop
 
-             #$last $first $ss $company $address1
-             #$address2 $city $state $county
-             #$country $zip $daytime $night $fax
-
-             #$ship_last $ship_first $ship_ss $ship_company $ship_address1
-             #$ship_address2 $ship_city $ship_state $ship_county
-             #$ship_country $ship_zip $ship_daytime $ship_night $ship_fax
-
-             #$invoicing_list $payby $payinfo
-             #$paycvv $paydate $payname $referral_custnum $init_popstate
-             #$pkgpart $username $_password $_password2 $sec_phrase $popnum
-             #$refnum
-
-             #$ac $exch $loc
-             #$email_name $pkg
 use subs qw( print_form print_okay print_decline
              success_default decline_default
            );
@@ -140,49 +123,11 @@ $init_data = signup_info( 'agentnum'   => $agentnum,
                           'promo_code' => scalar($cgi->param('promo_code')),
                           'reg_code'   => uc(scalar($cgi->param('reg_code'))),
                         );
-#$error = $init_data->{'error'};
-#$locales = $init_data->{'cust_main_county'};
-#$packages = $init_data->{'part_pkg'};
-#$pops = $init_data->{'svc_acct_pop'};
-#@payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}};
-#$packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum;
 
 if (    ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
      || ( defined($cgi->param('action')) && $cgi->param('action') eq 'process_signup' )
    ) {
 
-#    if ( $cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) {
-#      $state = $1;
-#      $county = $3 || '';
-#      $country = $4;
-#    } elsif ( $cgi->param('state') =~ /^(\w*)$/ ) {
-#      $state = $1;
-#      $cgi->param('county') =~ /^([\w ]*)$/
-#        or die "illegal county: ". $cgi->param('county');
-#      $county = $1;
-#      $cgi->param('country') =~ /^(\w+)$/
-#        or die "illegal country: ". $cgi->param('country');
-#      $country = $1;
-#    } else {
-#      die "illegal state: ". $cgi->param('state');
-#    }
-#    if ( $cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) {
-#      $ship_state = $1;
-#      $ship_county = $3 || '';
-#      $ship_country = $4;
-#    } elsif ( $cgi->param('ship_state') =~ /^(\w*)$/ ) {
-#      $ship_state = $1;
-#      $cgi->param('ship_county') =~ /^([\w ]*)$/
-#        or die "illegal county: ". $cgi->param('ship_county');
-#      $ship_county = $1;
-#      #$cgi->param('ship_country') =~ /^(\w+)$/
-#      $cgi->param('ship_country') =~ /^(\w*)$/
-#        or die "illegal ship_country: ". $cgi->param('ship_country');
-#      $ship_country = $1;
-#    #} else {
-#    #  die "illegal ship_state: ". $cgi->param('ship_state');
-#    }
-
     $error = '';
 
     $cgi->param('agentnum', $agentnum) if $agentnum;
@@ -271,47 +216,6 @@ if (    ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
 
 } else {
   $error = '';
-#  $last = '';
-#  $first = '';
-#  $ss = '';
-#  $company = '';
-#  $address1 = '';
-#  $address2 = '';
-#  $city = '';
-#  $state = $init_data->{statedefault};
-#  $county = '';
-#  $country = $init_data->{countrydefault};
-#  $zip = '';
-#  $daytime = '';
-#  $night = '';
-#  $fax = '';
-#  $ship_last = '';
-#  $ship_first = '';
-#  $ship_company = '';
-#  $ship_address1 = '';
-#  $ship_address2 = '';
-#  $ship_city = '';
-#  $ship_state = $init_data->{statedefault};
-#  $ship_county = '';
-#  $ship_country = $init_data->{countrydefault};
-#  $ship_zip = '';
-#  $ship_daytime = '';
-#  $ship_night = '';
-#  $ship_fax = '';
-#  $invoicing_list = '';
-#  $payby = '';
-#  $payinfo = '';
-#  $paydate = '';
-#  $payname = '';
-#  $pkgpart = '';
-#  $username = '';
-#  $_password = '';
-#  $_password2 = '';
-#  $sec_phrase = '';
-#  $popnum = '';
-#  $referral_custnum = $cgi->param('ref') || '';
-#  $init_popstate = $cgi->param('init_popstate') || '';
-#  $refnum = $init_data->{'refnum'};
   print_form;
 }
 
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html
index 3532527a2..2ab07b37e 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.html
+++ b/fs_selfservice/FS-SelfService/cgi/signup.html
@@ -14,10 +14,10 @@
 //--></script>
 <FONT SIZE=7><%= $agent || 'ISP' %> Signup form</FONT><BR><BR>
 <FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM NAME="OneTrueForm" ACTION="<%= $selfurl %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
+<FORM NAME="OneTrueForm" ACTION="<%= $self_url %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
 <INPUT TYPE="hidden" NAME="session" VALUE="<%= $session_id %>">
 <INPUT TYPE="hidden" NAME="action" VALUE="process_signup">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
+<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="<%= $referral_custnum %>">
 <INPUT TYPE="hidden" NAME="ss" VALUE="">
 Where did you hear about our service? <SELECT NAME="refnum">
 <%=
@@ -175,11 +175,14 @@ Contact Information
 
 </TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
 <BR><BR>First package
+<INPUT TYPE="hidden" NAME="promo_code" VALUE="<%= $promo_code %>">
+<INPUT TYPE="hidden" NAME="reg_code" VALUE="<%= $reg_code %>">
 <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
 <TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
+  <TD COLSPAN=2><SELECT NAME="pkgpart">
 
   <%=
+    $OUT .= '<OPTION VALUE="">(none)' unless scalar(@part_pkg ) ==1;
     foreach my $part_pkg ( @part_pkg ) {
       $OUT .= '<OPTION VALUE="'. $part_pkg->{'pkgpart'}. '"';
       $OUT .= ' SELECTED' if $pkgpart && $part_pkg->{'pkgpart'} == $pkgpart;
diff --git a/fs_signup/FS-SignupClient/cgi/stateselect.html b/fs_selfservice/FS-SelfService/cgi/stateselect.html
similarity index 100%
rename from fs_signup/FS-SignupClient/cgi/stateselect.html
rename to fs_selfservice/FS-SelfService/cgi/stateselect.html
diff --git a/fs_signup/FS-SignupClient/cgi/success.html b/fs_selfservice/FS-SelfService/cgi/success.html
similarity index 100%
rename from fs_signup/FS-SignupClient/cgi/success.html
rename to fs_selfservice/FS-SelfService/cgi/success.html
diff --git a/fs_signup/FS-SignupClient/Changes b/fs_signup/FS-SignupClient/Changes
deleted file mode 100644
index e750a82bc..000000000
--- a/fs_signup/FS-SignupClient/Changes
+++ /dev/null
@@ -1,5 +0,0 @@
-Revision history for Perl extension FS::SignupClient.
-
-0.01  Mon Aug 23 01:12:46 1999
-	- original version; created by h2xs 1.19
-
diff --git a/fs_signup/FS-SignupClient/MANIFEST b/fs_signup/FS-SignupClient/MANIFEST
deleted file mode 100644
index 365ae660b..000000000
--- a/fs_signup/FS-SignupClient/MANIFEST
+++ /dev/null
@@ -1,7 +0,0 @@
-Changes
-MANIFEST
-MANIFEST.SKIP
-Makefile.PL
-SignupClient.pm
-test.pl
-cgi/signup.cgi
diff --git a/fs_signup/FS-SignupClient/MANIFEST.SKIP b/fs_signup/FS-SignupClient/MANIFEST.SKIP
deleted file mode 100644
index ae335e78a..000000000
--- a/fs_signup/FS-SignupClient/MANIFEST.SKIP
+++ /dev/null
@@ -1 +0,0 @@
-CVS/
diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL
deleted file mode 100644
index 9850c870d..000000000
--- a/fs_signup/FS-SignupClient/Makefile.PL
+++ /dev/null
@@ -1,17 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'	    => 'FS::SignupClient',
-    'VERSION_FROM'  => 'SignupClient.pm', # finds $VERSION
-#    'EXE_FILES'     => [ 'fs_signupd' ],
-#    'INSTALLSCRIPT' => '/usr/local/sbin',
-#    'INSTALLSITEBIN' => '/usr/local/sbin',
-    'PERM_RWX'      => '750',
-    'PREREQ_PM'     => {
-                         'Business::CreditCard' => 0,
-                         'HTTP::BrowserDetect' => 0,
-                         'Text::Template' => 0,
-                         'FS::SelfService' => 0,
-                       },
-);
diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
deleted file mode 100644
index d6730301c..000000000
--- a/fs_signup/FS-SignupClient/SignupClient.pm
+++ /dev/null
@@ -1,209 +0,0 @@
-package FS::SignupClient;
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $init_data); # $fs_signupd_socket);
-use Exporter;
-#use Socket;
-#use FileHandle;
-#use IO::Handle;
-#use Storable qw(nstore_fd fd_retrieve);
-use FS::SelfService; # qw( new_customer signup_info );
-
-$VERSION = '0.04';
-
-@ISA = qw( Exporter );
-@EXPORT_OK = qw( signup_info new_customer regionselector expselect popselector);
-
-=head1 NAME
-
-FS::SignupClient - Freeside signup client API
-
-=head1 SYNOPSIS
-
-  use FS::SignupClient qw( signup_info new_customer );
-
-  #this is the backwards-compatibility bit
-  ( $locales, $packages, $pops, $real_signup_info ) = signup_info;
-
-  #this is compatible with FS::SelfService::new_customer
-  $error = new_customer ( {
-    'first'            => $first,
-    'last'             => $last,
-    'ss'               => $ss,
-    'comapny'          => $company,
-    'address1'         => $address1,
-    'address2'         => $address2,
-    'city'             => $city,
-    'county'           => $county,
-    'state'            => $state,
-    'zip'              => $zip,
-    'country'          => $country,
-    'daytime'          => $daytime,
-    'night'            => $night,
-    'fax'              => $fax,
-    'payby'            => $payby,
-    'payinfo'          => $payinfo,
-    'paycvv'           => $paycvv,
-    'paydate'          => $paydate,
-    'payname'          => $payname,
-    'invoicing_list'   => $invoicing_list,
-    'referral_custnum' => $referral_custnum,
-    'comments'         => $comments,
-    'pkgpart'          => $pkgpart,
-    'username'         => $username,
-    '_password'        => $password,
-    'sec_phrase'       => $sec_phrase,
-    'popnum'           => $popnum,
-    'agentnum'         => $agentnum, #optional
-  } );
-
-=head1 DESCRIPTION
-
-This module provides an API for a remote signup server.
-
-It needs to be run as the freeside user.  Because of this, the program which
-calls these subroutines should be written very carefully.
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item signup_info
-
-Returns three array references of hash references.
-
-The first set of hash references is of allowable locales.  Each hash reference
-has the following keys:
-  taxnum
-  state
-  county
-  country
-
-The second set of hash references is of allowable packages.  Each hash
-reference has the following keys:
-  pkgpart
-  pkg
-
-The third set of hash references is of allowable POPs (Points Of Presence).
-Each hash reference has the following keys:
-  popnum
-  city
-  state
-  ac
-  exch
-
-(Future expansion: fourth argument is the $init_data hash reference)
-
-=cut
-
-#compatibility bit
-sub signup_info {
-
-  $init_data = FS::SelfService::signup_info();
-
-  (map { $init_data->{$_} } qw( cust_main_county part_pkg svc_acct_pop ) ),
-  $init_data;
-
-}
-
-=item new_customer HASHREF
-
-Adds a customer to the remote Freeside system.  Requires a hash reference as
-a paramater with the following keys:
-  first
-  last
-  ss
-  comapny
-  address1
-  address2
-  city
-  county
-  state
-  zip
-  country
-  daytime
-  night
-  fax
-  payby
-  payinfo
-  paycvv
-  paydate
-  payname
-  invoicing_list
-  referral_custnum
-  comments
-  pkgpart
-  username
-  _password
-  sec_phrase
-  popnum
-
-Returns a scalar error message, or the empty string for success.
-
-=cut
-
-#compatibility bit
-sub new_customer { 
-  my $hash = FS::SelfService::new_customer(@_);
-  $hash->{'error'};
-}
-
-=item regionselector SELECTED_COUNTY, SELECTED_STATE, SELECTED_COUNTRY, PREFIX, ONCHANGE
-
-=cut
-
-sub regionselector {
-  my ( $selected_county, $selected_state, $selected_country,
-       $prefix, $onchange ) = @_;
-  signup_info() unless $init_data;
-  FS::SelfService::regionselector({
-    selected_county  => $selected_county,
-    selected_state   => $selected_state,
-    selected_country => $selected_country,
-    prefix           => $prefix,
-    onchange         => $onchange,
-    default_country  => $init_data->{countrydefault},
-    locales          => $init_data->{cust_main_county},
-  });
-    #default_state    => $init_data->{statedefault},
-}
-
-=item expselect PREFIX, DATE
-
-=cut
-
-sub expselect {
-  FS::SelfService::expselect(@_);
-}
-
-=item popselector 
-
-=cut
-
-sub popselector {
-  my( $popnum ) = @_;
-  signup_info() unless $init_data;
-  FS::SelfService::popselector({
-    popnum => $popnum,
-    pops   => $init_data->{svc_acct_pop},
-  });
-    #popac =>
-    #acstate =>
-}
-
-=back
-
-=head1 BUGS
-
-This is just a wrapper around FS::SelfService functions for backwards
-compatibility.  It is only necessary if you're using a signup.cgi from before
-1.5.0pre7.
-
-=head1 SEE ALSO
-
-L<fs_signupd>, L<FS::cust_main>
-
-=cut
-
-1;
-
diff --git a/fs_signup/FS-SignupClient/cgi/cvv2.html b/fs_signup/FS-SignupClient/cgi/cvv2.html
deleted file mode 100644
index b178c8513..000000000
--- a/fs_signup/FS-SignupClient/cgi/cvv2.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE>
-      CVV2 information
-    </TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-  The CVV2 number (also called CVC2 or CID) is a three- or four-digit
-  security code used to reduce credit card fraud.<BR><BR>
-  <TABLE BORDER=0 CELLSPACING=4>
-    <TR>
-      <TH>Visa / MasterCard / Discover</TH>
-      <TH>American Express</TH>
-    </TR>
-    <TR>
-      <TD>
-        <IMG BORDER=0 ALT="Visa/MasterCard/Discover" SRC="cvv2.png">
-      </TD>
-      <TD>
-        <IMG BORDER=0 ALT="American Express" SRC="cvv2_amex.png">
-      </TD>
-  </TABLE>
-    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
-  </BODY>
-</HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/cvv2.png b/fs_signup/FS-SignupClient/cgi/cvv2.png
deleted file mode 100644
index 4610dcbe62aa30a493a84265090f59ade25d83f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3854
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
Q>;M1&07*qoM6N<$f(|>W{Qv*}

diff --git a/fs_signup/FS-SignupClient/cgi/cvv2_amex.png b/fs_signup/FS-SignupClient/cgi/cvv2_amex.png
deleted file mode 100644
index 21c36a0ab5eb9f9fe56bb994007ac2d5284d55c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4573
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
Hu0mjf_HDMR

diff --git a/fs_signup/FS-SignupClient/cgi/decline.html b/fs_signup/FS-SignupClient/cgi/decline.html
deleted file mode 100644
index a37ba3ab6..000000000
--- a/fs_signup/FS-SignupClient/cgi/decline.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR>
-There has been an error processing your account.  Please contact customer
-support.
-</BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/map.gif b/fs_signup/FS-SignupClient/cgi/map.gif
deleted file mode 100644
index ef884d8f948db2b04cd43dac72600b3d6ff7cd85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8181
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
bs&BpPUl04(%YOE>uf6SWkNe!KJ^=tbEHr(M

diff --git a/fs_signup/FS-SignupClient/cgi/promocode.html b/fs_signup/FS-SignupClient/cgi/promocode.html
deleted file mode 100644
index f8ee7f6eb..000000000
--- a/fs_signup/FS-SignupClient/cgi/promocode.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup - promotional code</FONT><BR><BR>
-<SCRIPT>
-function gotoURL(object) {
-    window.location.href =  'signup.cgi?promo_code=' + object.promo_code.value;
-}
-</SCRIPT>
-<FORM>
-Enter promotional code <INPUT TYPE="text" NAME="promo_code">
-<INPUT type="submit" VALUE="Signup" onClick="gotoURL(this.form)">
-
-</FORM>
-</BODY>
-</HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/regcode.html b/fs_signup/FS-SignupClient/cgi/regcode.html
deleted file mode 100644
index e639b9b53..000000000
--- a/fs_signup/FS-SignupClient/cgi/regcode.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup - registration code</FONT><BR><BR>
-<SCRIPT>
-function gotoURL(object) {
-    window.location.href =  'signup.cgi?reg_code=' + object.reg_code.value;
-}
-</SCRIPT>
-<FORM>
-Enter registration code <INPUT TYPE="text" NAME="reg_code">
-<INPUT type="submit" VALUE="Signup" onClick="gotoURL(this.form)">
-
-</FORM>
-</BODY>
-</HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup-agentselect.html b/fs_signup/FS-SignupClient/cgi/signup-agentselect.html
deleted file mode 100755
index 7851c5601..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup-agentselect.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM NAME="OneTrueForm" ACTION="<%= $self_url %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-Agent <SELECT NAME="agentnum">
-<%=
-  warn $init_data;
-  warn $init_data->{'agent'};
-  foreach my $agent ( @{$init_data->{'agent'}} ) {
-    $OUT .= '<OPTION VALUE="'. $agent->{'agentnum'}. '"';
-    $OUT .= ' SELECTED' if $agent->{'agentnum'} eq $agentnum;
-    $OUT .= '>'. $agent->{'agent'};
-  }
-%>
-</SELECT><BR><BR>
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD>
-    <%=
-        ($county_html, $state_html, $country_html) =
-          regionselector( $county, $state, $country );
- 
-        "$county_html $state_html";
-    %>
-  </TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
-  <TD><%= $country_html %></TD>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
-</TR>
-</TABLE><font color="#ff0000">*</font> required fields<BR>
-<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR><TD>
-
-  <%=
-    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
-    my @invoicing_list = split(', ', $invoicing_list );
-    $OUT .= ' CHECKED'
-      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-    $OUT .= '>';
-  %>
-
-  Postal mail invoice
-</TD></TR>
-<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
-</TD></TR>
-<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
-</TABLE>
-<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
-<TR>
-
-  <%=
-
-    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-    my %types = (
-                  'VISA' => 'VISA card',
-                  'MasterCard' => 'MasterCard',
-                  'Discover' => 'Discover card',
-                  'American Express' => 'American Express card',
-                );
-    foreach ( keys %types ) {
-      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-    }
-    $cardselect .= '</SELECT>';
-  
-    my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
-    );
-
-    my( $account, $aba ) = split('@', $payinfo);
-    my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
-    );
-
-    for (@payby) {
-      if ( scalar(@payby) == 1) {
-        $OUT .= '<TD VALIGN=TOP>'.
-                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
-                "$paybychecked{$_}</TD>";
-      } else {
-        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-        if ($payby eq $_) {
-          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
-        } else {
-          $OUT .= qq!> $payby{$_}</TD>!;
-        }
-
-      }
-    }
-  %>
-
-</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
-<BR><BR>First package
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
-
-  <%=
-    foreach my $package ( @{$packages} ) {
-      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
-      $OUT .= ' SELECTED' if $pkgpart && $package->{'pkgpart'} == $pkgpart;
-      $OUT .= '>'. $package->{'pkg'};
-    }
-  %>
-
-  </SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-<%=
-  if ( $init_data->{'security_phrase'} ) {
-    $OUT .= <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-  } else {
-    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-  }
-%>
-<%=
-  if ( scalar(@$pops) ) {
-    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
-            popselector($popnum). '</TD></TR>';
-  } else {
-    $OUT .= popselector($popnum);
-  }
-%>
-</TABLE>
-<BR><BR><INPUT TYPE="submit" NAME="signup" VALUE="Signup" >
-</FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
deleted file mode 100755
index 490cefa5e..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html
+++ /dev/null
@@ -1,218 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM NAME="dummy">
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-<INPUT TYPE="hidden" NAME="agentnum" VALUE="3">
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD><SELECT NAME="state" SIZE="1">
-
-  <%=
-    foreach ( @{$locales} ) {
-      my $value = $_->{'state'};
-      $value .= ' ('. $_->{'county'}. ')' if $_->{'county'};
-      $value .= ' / '. $_->{'country'};
-
-      $OUT .= qq(<OPTION VALUE="$value");
-      $OUT .= ' SELECTED' if ( $state eq $_->{'state'}
-                               && $county eq $_->{'county'}
-                               && $country eq $_->{'country'}
-                             );
-      $OUT .= ">$value</OPTION>";
-    }
-  %>
-
-  </SELECT></TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
-</TR>
-</TABLE><font color="#ff0000">*</font> required fields<BR>
-
-<BR><BR>
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Username</TH>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Password</TH>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Re-enter Password</TH>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-
-<%= if ( $init_data->{'security_phrase'} ) {
-      <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-    } else {
-      '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-    }
-%>
-
-<%= if ( scalar(@$pops) ) {
-      '<TR><TD ALIGN="right">Access number</TD><TD>'.
-           popselector($popnum). '</TD></TR>';
-    } else {
-      popselector($popnum);
-    }
-%>
-
-</TABLE><font color="#ff0000">*</font> required fields
-
-<BR><BR>First package
-
-  <%= use Tie::IxHash;
-      my %pkgpart2payby = map { $_->{pkgpart} => $_->{payby}[0] } @{$packages};
-      tie my %options, 'Tie::IxHash',
-        '' => '(none)',
-        map { $_->{pkgpart} => $_->{pkg} }
-          sort { $a->{recur} <=> $b->{recur} }
-            @{$packages} 
-      ;
-
-      use HTML::Widgets::SelectLayers 0.02;
-      my @form_text = qw( magic ref ss agentnum
-                          last first company address1 address2
-                          city zip daytime night fax
-                          username _password _password2 sec_phrase );
-      my @form_select = qw( state ); #county country
-      if ( scalar(@$pops) == 0 or scalar(@$pops) == 1 ) {
-        push @form_text, 'popnum',
-      } else {
-        push @form_select, 'popnum',
-      }
-      my $widget = new HTML::Widgets::SelectLayers(
-        options => \%options,
-        selected_layer => $pkgpart,
-        form_name => 'dummy',
-        form_action => $self_url,
-        form_text => \@form_text,
-        form_select => \@form_select,
-        layer_callback => sub {
-          my $layer = shift;
-          my $html = qq( <INPUT TYPE="hidden" NAME="pkgpart" VALUE="$layer">);
-
-          if ( $pkgpart2payby{$layer} eq 'BILL' ) {
-            $html .= <<ENDOUT;
-<INPUT TYPE="hidden" NAME="payby" VALUE="BILL">
-<INPUT TYPE="hidden" NAME="invoicing_list_POST" VALUE="">
-<INPUT TYPE="hidden" NAME="BILL_payinfo" VALUE="">
-<INPUT TYPE="hidden" NAME="BILL_month" VALUE="12">
-<INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">
-<INPUT TYPE="hidden" NAME="BILL_payname" VALUE="">
-<BR><BR><INPUT TYPE="submit" VALUE="Signup">
-ENDOUT
-          } elsif ( $pkgpart2payby{$layer} eq 'CARD' ) {
-            my $postal_checked = '';
-            my @invoicing_list = split(', ', $invoicing_list );
-            $postal_checked = 'CHECKED'
-              if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-
-            $invoicing_list= join(', ', grep { $_ ne 'POST' } @invoicing_list );
-
-            my $expselect = expselect("CARD", $paydate);
-
-            my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-            my %types = (
-                          'VISA' => 'VISA card',
-                          'MasterCard' => 'MasterCard',
-                          'Discover' => 'Discover card',
-                          'American Express' => 'American Express card',
-                        );
-            foreach ( keys %types ) {
-              $selected =
-                $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-              $cardselect .=
-                qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-            }
-            $cardselect .= '</SELECT>';
-
-            $html .= <<ENDOUT;
-<INPUT TYPE="hidden" NAME="payby" VALUE="CARD">
-<BR><BR>Billing information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0>
-<INPUT TYPE="hidden" NAME="invoicing_list_POST" VALUE="">
-<TR>
-  <TD ALIGN="right">Email statement to </TD>
-  <TD><INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Credit card type</TH>
-  <TD>$cardselect</TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Card number</TH>
-  <TD><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>*</font>Exp</TH>
-  <TD>$expselect</TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Name on card</TH>
-  <TD><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname"></TD>
-</TR>
-</TABLE>
-<font color="#ff0000">*</font> required fields
-<BR><BR><INPUT TYPE="submit" VALUE="Signup">
-ENDOUT
-          } else {
-            $html = <<ENDOUT;
-<BR>Please select a package.<BR>
-ENDOUT
-
-          }
-
-          $html;
-
-        },
-      );
-
-      $widget->html;
-
-
- %>
-</BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup-billaddress.html b/fs_signup/FS-SignupClient/cgi/signup-billaddress.html
deleted file mode 100755
index 3cf9d2505..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup-billaddress.html
+++ /dev/null
@@ -1,307 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8" onUnload="myclose()">
-<script language="JavaScript"><!--
-  var mywindow = -1;
-  function myopen(filename,windowname,properties) {
-    myclose();
-    mywindow = window.open(filename,windowname,properties);
-  }
-  function myclose() {
-    if ( mywindow != -1 )
-      mywindow.close();
-    mywindow = -1
-  }
-//--></script>
-<FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM NAME="OneTrueForm" ACTION="<%= $self_url %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-Where did you hear about our service? <SELECT NAME="refnum">
-<%=
-  $OUT .= '<OPTION VALUE="">' unless $refnum;
-  foreach my $part_referral ( @{$init_data->{'part_referral'}} ) {
-    $OUT .= '<OPTION VALUE="'. $part_referral->{'refnum'}. '"';
-    $OUT .= ' SELECTED' if $part_referral->{'refnum'} eq $refnum;
-    $OUT .= '>'. $part_referral->{'referral'};
-  }
-%>
-</SELECT><BR><BR>
-Billing Address (where credit card statement is sent)
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Exact name on card<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>" onChange="changed(this)">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>" onChange="changed(this)"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD>
-    <%=
-        ($county_html, $state_html, $country_html) =
-          regionselector( $county, $state, $country, '', 'changed(this)' );
- 
-        "$county_html $state_html";
-    %>
-  </TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
-  <TD><%= $country_html %></TD>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18 onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18 onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12 onChange="changed(this)"></TD>
-</TR>
-</TABLE>
-
-<SCRIPT>
-function changed(what) {
-  what.form.same.checked = false;
-}
-function samechanged(what) {
-  if ( what.checked ) {
-
-    <%= foreach (qw(
-          last first company address1 address2 city zip daytime night fax
-        )) {
-          $OUT .= "what.form.ship_$_.value = what.form.$_.value;\n";
-        }
-    %>
-
-    what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
-    ship_country_changed(what.form.ship_country);
-    what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
-    ship_state_changed(what.form.ship_state);
-    what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
-  }
-}
-</SCRIPT>
-
-<BR><BR>
-Service Address
-(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)" <%= $same eq 'Y' ? 'CHECKED' : '' %>>same as billing address)<BR>
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="ship_last" VALUE="<%= $ship_last %>" onChange="changed(this)">,
-                <INPUT TYPE="text" NAME="ship_first" VALUE="<%= $ship_first %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="ship_company" SIZE=70 VALUE="<%= $ship_company %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address1" SIZE=70 VALUE="<%= $ship_address1 %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address2" SIZE=70 VALUE="<%= $ship_address2 %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="ship_city" VALUE="<%= $ship_city %>" onChange="changed(this)"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD>
-    <%=
-        ($ship_county_html, $ship_state_html, $ship_country_html) =
-          regionselector( $ship_county,
-                          $ship_state,
-                          $ship_country,
-                          'ship_',
-                          'changed(this)',
-                        );
- 
-        "$ship_county_html $ship_state_html";
-    %>
-  </TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="ship_zip" SIZE=10 VALUE="<%= $ship_zip %>" onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
-  <TD><%= $ship_country_html %></TD>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="<%= $ship_daytime %>" SIZE=18 onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="<%= $ship_night %>" SIZE=18 onChange="changed(this)"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="ship_fax" VALUE="<%= $ship_fax %>" SIZE=12 onChange="changed(this)"></TD>
-</TR>
-</TABLE>
-
-<font color="#ff0000">*</font> required fields<BR>
-
-<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR><TD>
-
-  <%=
-    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
-    my @invoicing_list = split(', ', $invoicing_list );
-    $OUT .= ' CHECKED'
-      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-    $OUT .= '>';
-  %>
-
-  Postal mail invoice
-</TD></TR>
-<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
-</TD></TR>
-<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
-</TABLE>
-<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
-<TR>
-
-  <%=
-
-    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-    my %types = (
-                  'VISA' => 'VISA card',
-                  'MasterCard' => 'MasterCard',
-                  'Discover' => 'Discover card',
-                  'American Express' => 'American Express card',
-                );
-    foreach ( keys %types ) {
-      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-    }
-    $cardselect .= '</SELECT>';
-  
-    my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"), #. qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"), #. qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
-    );
-
-    if ( $init_data->{'cvv_enabled'} ) {
-      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
-        $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
-      }
-    }
-
-    my( $account, $aba ) = split('@', $payinfo);
-    my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate), #. qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate), #. qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
-    );
-
-    if ( $init_data->{'cvv_enabled'} ) {
-      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
-        $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
-      }
-    }
-
-    for (@payby) {
-      if ( scalar(@payby) == 1) {
-        $OUT .= '<TD VALIGN=TOP>'.
-                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
-                "$paybychecked{$_}</TD>";
-      } else {
-        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-        if ($payby eq $_) {
-          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
-        } else {
-          $OUT .= qq!> $payby{$_}</TD>!;
-        }
-
-      }
-    }
-  %>
-
-</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
-<BR><BR>First package
-<INPUT TYPE="hidden" NAME="promo_code" VALUE="<%= $cgi->param('promo_code') %>">
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart">
-
-  <%=
-    $OUT .= '<OPTION VALUE="">(none)' unless scalar(@$packages) == 1;
-    foreach my $package ( @{$packages} ) {
-      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
-      $OUT .= ' SELECTED'
-        if ( $pkgpart && $package->{'pkgpart'} == $pkgpart )
-           || scalar(@$packages) == 1;
-      $OUT .= '>'. $package->{'pkg'};
-    }
-  %>
-
-  </SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-<%=
-  if ( $init_data->{'security_phrase'} ) {
-    $OUT .= <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-  } else {
-    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-  }
-%>
-<%=
-  if ( scalar(@$pops) ) {
-    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
-            popselector($popnum). '</TD></TR>';
-  } else {
-    $OUT .= popselector($popnum);
-  }
-%>
-</TABLE>
-<BR><BR><INPUT TYPE="submit" NAME="signup" VALUE="Signup">
-</FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup-freeoption.html b/fs_signup/FS-SignupClient/cgi/signup-freeoption.html
deleted file mode 100755
index 40ad03c0b..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup-freeoption.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8" onUnload="myclose()">
-<script language="JavaScript"><!--
-  var mywindow = -1;
-  function myopen(filename,windowname,properties) {
-    myclose();
-    mywindow = window.open(filename,windowname,properties);
-  }
-  function myclose() {
-    if ( mywindow != -1 )
-      mywindow.close();
-    mywindow = -1
-  }
-//--></script>
-<FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM NAME="OneTrueForm" ACTION="<%= $self_url %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-Where did you hear about our service? <SELECT NAME="refnum">
-<%=
-  $OUT .= '<OPTION VALUE="">' unless $refnum;
-  foreach my $part_referral ( @{$init_data->{'part_referral'}} ) {
-    $OUT .= '<OPTION VALUE="'. $part_referral->{'refnum'}. '"';
-    $OUT .= ' SELECTED' if $part_referral->{'refnum'} eq $refnum;
-    $OUT .= '>'. $part_referral->{'referral'};
-  }
-%>
-</SELECT><BR><BR>
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD>
-    <%=
-        ($county_html, $state_html, $country_html) =
-          regionselector( $county, $state, $country );
- 
-        "$county_html $state_html";
-    %>
-  </TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
-  <TD><%= $country_html %></TD>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
-</TR>
-</TABLE><font color="#ff0000">*</font> required fields<BR>
-<BR>
-<%=
-  my $first_payby = $packages->[0]{'payby'}[0];
-  unless ( grep { scalar( @{$_->{'payby'}} ) > 1
-                    || $_->{'payby'}->[0] ne $first_payby
-                } @$packages
-  ) { 
-    @payby = ( $first_payby );
-  }
-
-  unless ( scalar(@payby) == 1 && $payby[0] eq 'BILL' ) {
-
-    $OUT .= ' Billing information
-            <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-            <TR><TD>
-            <INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
-
-    my @invoicing_list = split(', ', $invoicing_list );
-
-    $OUT .= ' CHECKED'
-      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-
-    $OUT .= '> Postal mail invoice
-            </TD></TR>
-            <TR><TD>Email invoice 
-            <INPUT TYPE="text" NAME="invoicing_list" VALUE="'
-              .join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ).
-            '"></TD></TR>';
-
-    $OUT .= '<TR><TD>Billing type</TD></TR>'
-      if scalar(@payby) > 1;
-
-    $OUT .= '</TABLE>';
-
-  } else {
-    $OUT .= '<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="">
-             <INPUT TYPE="hidden" NAME="invoicing_list_POST" VALUE="">';
-  }
-
-%>
-
-<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
-<TR>
-
-  <%=
-
-    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-    my %types = (
-                  'VISA' => 'VISA card',
-                  'MasterCard' => 'MasterCard',
-                  'Discover' => 'Discover card',
-                  'American Express' => 'American Express card',
-                );
-    foreach ( keys %types ) {
-      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-    }
-    $cardselect .= '</SELECT>';
-  
-    my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => <<'END',
-<INPUT TYPE="hidden" NAME="BILL_payinfo" VALUE="">
-<INPUT TYPE="hidden" NAME="BILL_month" VALUE="12">
-<INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">
-<INPUT TYPE="hidden" NAME="BILL_payname" VALUE="">
-END
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
-    );
-
-    if ( $init_data->{'cvv_enabled'} ) {
-      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
-        $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
-      }
-    }
-
-    my( $account, $aba ) = split('@', $payinfo);
-    my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => <<'END',
-<INPUT TYPE="hidden" NAME="BILL_payinfo" VALUE="">
-<INPUT TYPE="hidden" NAME="BILL_month" VALUE="12">
-<INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">
-<INPUT TYPE="hidden" NAME="BILL_payname" VALUE="">
-END
-
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
-    );
-
-    if ( $init_data->{'cvv_enabled'} ) {
-      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
-        $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
-      }
-    }
-
-    for (@payby) {
-      if ( scalar(@payby) == 1) {
-        $OUT .= '<TD VALIGN=TOP>'.
-                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
-                "$paybychecked{$_}</TD>";
-      } else {
-        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-        if ($payby eq $_) {
-          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
-        } else {
-          $OUT .= qq!> $payby{$_}</TD>!;
-        }
-
-      }
-    }
-  %>
-
-</TR></TABLE>
-<%= unless ( scalar(@payby) == 1 && $payby[0] eq 'BILL' ) {
-      $OUT .= '<font color="#ff0000">*</font> required fields for each billing type';
-    }
-    '';
-%>
-<BR><BR>First package
-<INPUT TYPE="hidden" NAME="promo_code" VALUE="<%= $cgi->param('promo_code') %>"><TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart">
-
-  <%=
-    $OUT .= '<OPTION VALUE="">(none)' unless scalar(@$packages) == 1;
-    foreach my $package ( @{$packages} ) {
-      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
-      $OUT .= ' SELECTED'
-        if ( $pkgpart && $package->{'pkgpart'} == $pkgpart )
-           || scalar(@$packages) == 1;
-      $OUT .= '>'. $package->{'pkg'};
-    }
-  %>
-
-  </SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-<%=
-  if ( $init_data->{'security_phrase'} ) {
-    $OUT .= <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-  } else {
-    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-  }
-%>
-<%=
-  if ( scalar(@$pops) ) {
-    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
-            popselector($popnum). '</TD></TR>';
-  } else {
-    $OUT .= popselector($popnum);
-  }
-%>
-</TABLE>
-<BR><BR><INPUT TYPE="submit" NAME="signup" VALUE="Signup">
-</FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup-snarf.html b/fs_signup/FS-SignupClient/cgi/signup-snarf.html
deleted file mode 100755
index d167efbf9..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup-snarf.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8" onUnload="myclose()">
-<script language="JavaScript"><!--
-  var mywindow = -1;
-  function myopen(filename,windowname,properties) {
-    myclose();
-    mywindow = window.open(filename,windowname,properties);
-  }
-  function myclose() {
-    if ( mywindow != -1 )
-      mywindow.close();
-    mywindow = -1
-  }
-//--></script>
-<FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM ACTION="<%= $self_url %>" METHOD=POST>
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD>
-    <%=
-        ($county_html, $state_html, $country_html) =
-          regionselector( $county, $state, $country );
- 
-        "$county_html $state_html";
-    %>
-  </TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
-  <TD><%= $country_html %></TD>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
-</TR>
-</TABLE><font color="#ff0000">*</font> required fields<BR>
-<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR><TD>
-
-  <%=
-    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
-    my @invoicing_list = split(', ', $invoicing_list );
-    $OUT .= ' CHECKED'
-      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-    $OUT .= '>';
-  %>
-
-  Postal mail invoice
-</TD></TR>
-<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
-</TD></TR>
-<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
-</TABLE>
-<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
-<TR>
-
-  <%=
-
-    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-    my %types = (
-                  'VISA' => 'VISA card',
-                  'MasterCard' => 'MasterCard',
-                  'Discover' => 'Discover card',
-                  'American Express' => 'American Express card',
-                );
-    foreach ( keys %types ) {
-      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-    }
-    $cardselect .= '</SELECT>';
-  
-    my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
-    );
-
-    if ( $init_data->{'cvv_enabled'} ) {
-      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
-        $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
-      }
-    }
-
-    my( $account, $aba ) = split('@', $payinfo);
-    my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
-    );
-
-    if ( $init_data->{'cvv_enabled'} ) {
-      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
-        $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
-      }
-    }
-
-    for (@payby) {
-      if ( scalar(@payby) == 1) {
-        $OUT .= '<TD VALIGN=TOP>'.
-                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
-                "$paybychecked{$_}</TD>";
-      } else {
-        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-        if ($payby eq $_) {
-          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
-        } else {
-          $OUT .= qq!> $payby{$_}</TD>!;
-        }
-
-      }
-    }
-  %>
-
-</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
-<BR><BR>First package
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
-
-  <%=
-    foreach my $package ( @{$packages} ) {
-      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
-      $OUT .= ' SELECTED' if $pkgpart && $package->{'pkgpart'} == $pkgpart;
-      $OUT .= '>'. $package->{'pkg'};
-    }
-  %>
-
-  </SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-<%=
-  if ( $init_data->{'security_phrase'} ) {
-    $OUT .= <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-  } else {
-    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-  }
-%>
-<%=
-  if ( scalar(@$pops) ) {
-    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
-            popselector($popnum). '</TD></TR>';
-  } else {
-    $OUT .= popselector($popnum);
-  }
-%>
-</TABLE>
-<BR><BR>Enter up to ten external accounts from which to retrieve email
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="left">Mail server</TH>
-  <TH ALIGN="left">Username</TH>
-  <TH ALIGN="left">Password</TH>
-</TR>
-<%=
-  for my $num ( 1..10 ) {
-    no strict 'vars';
-    $OUT .= qq!<TR><TD><INPUT TYPE="text" NAME="snarf_machine$num" VALUE="${"snarf_machine$num"}"></TD>!.
-            qq!<INPUT TYPE="hidden" NAME="snarf_protocol$num" VALUE="pop3">!.
-            qq!<TD><INPUT TYPE="text" NAME="snarf_username$num" VALUE="${"snarf_username$num"}"></TD>!.
-            qq!<TD><INPUT TYPE="password" NAME="snarf_password$num" VALUE="${"snarf_password$num"}"></TD>!.
-            qq!</TR>!;
-  }
-%>
-</TABLE>
-
-<BR><BR><INPUT TYPE="submit" VALUE="Signup">
-</FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
deleted file mode 100755
index aae3fb84a..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ /dev/null
@@ -1,505 +0,0 @@
-#!/usr/bin/perl -T
-#!/usr/bin/perl -Tw
-#
-# $Id: signup.cgi,v 1.55 2005-01-29 12:34:11 ivan Exp $
-
-use strict;
-use vars qw( @payby $cgi $locales $packages
-             $pops %pop %popnum2pop
-             $init_data $error
-
-             $last $first $ss $company $address1
-             $address2 $city $state $county
-             $country $zip $daytime $night $fax
-
-             $ship_last $ship_first $ship_ss $ship_company $ship_address1
-             $ship_address2 $ship_city $ship_state $ship_county
-             $ship_country $ship_zip $ship_daytime $ship_night $ship_fax
-
-             $invoicing_list $payby $payinfo
-             $paycvv $paydate $payname $referral_custnum $init_popstate
-             $pkgpart $username $password $password2 $sec_phrase $popnum
-             $agentnum $refnum
-             $ieak_file $ieak_template
-             $signup_html $signup_template
-             $success_html $success_template
-             $decline_html $decline_template
-             $ac $exch $loc
-             $email_name $pkg
-             $self_url
-           );
-use subs qw( print_form print_okay print_decline
-             success_default decline_default
-           );
-use CGI;
-#use CGI::Carp qw(fatalsToBrowser);
-use Text::Template;
-use Business::CreditCard;
-use HTTP::BrowserDetect;
-use FS::SelfService qw( signup_info new_customer expselect );
-
-#acceptable payment methods
-#
-#@payby = qw( CARD BILL COMP );
-#@payby = qw( CARD BILL );
-#@payby = qw( CARD );
-@payby = qw( CARD PREPAY );
-
-$ieak_file = '/usr/local/freeside/ieak.template';
-$signup_html = -e 'signup.html'
-                 ? 'signup.html'
-                 : '/usr/local/freeside/signup.html';
-$success_html = -e 'success.html'
-                  ? 'success.html'
-                  : '/usr/local/freeside/success.html';
-$decline_html = -e 'decline.html'
-                  ? 'decline.html'
-                  : '/usr/local/freeside/decline.html';
-
-
-if ( -e $ieak_file ) {
-  my $ieak_txt = Text::Template::_load_text($ieak_file)
-    or die $Text::Template::ERROR;
-  $ieak_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $ieak_txt = $1;
-  $ieak_txt =~ s/\r//g; # don't double \r on old templates
-  $ieak_txt =~ s/\n/\r\n/g;
-  $ieak_template = new Text::Template ( TYPE => 'STRING', SOURCE => $ieak_txt )
-    or die $Text::Template::ERROR;
-} else {
-  $ieak_template = '';
-}
-
-$agentnum = '';
-if ( -e $signup_html ) {
-  my $signup_txt = Text::Template::_load_text($signup_html)
-    or die $Text::Template::ERROR;
-  $signup_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $signup_txt = $1;
-  $signup_template = new Text::Template ( TYPE => 'STRING',
-                                          SOURCE => $signup_txt,
-                                          DELIMITERS => [ '<%=', '%>' ]
-                                        )
-    or die $Text::Template::ERROR;
-  if ( $signup_txt =~
-         /<\s*INPUT TYPE="?hidden"?\s+NAME="?agentnum"?\s+VALUE="?(\d+)"?\s*>/si
-  ) {
-    $agentnum = $1;
-  }
-} else {
-  #too much maintenance hassle to keep in this file
-  die "can't find ./signup.html or /usr/local/freeside/signup.html";
-  #$signup_template = new Text::Template ( TYPE => 'STRING',
-  #                                        SOURCE => &signup_default,
-  #                                        DELIMITERS => [ '<%=', '%>' ]
-  #                                      )
-  #  or die $Text::Template::ERROR;
-}
-
-if ( -e $success_html ) {
-  my $success_txt = Text::Template::_load_text($success_html)
-    or die $Text::Template::ERROR;
-  $success_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $success_txt = $1;
-  $success_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => $success_txt,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-} else {
-  $success_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => &success_default,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-}
-
-if ( -e $decline_html ) {
-  my $decline_txt = Text::Template::_load_text($decline_html)
-    or die $Text::Template::ERROR;
-  $decline_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $decline_txt = $1;
-  $decline_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => $decline_txt,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-} else {
-  $decline_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => &decline_default,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-}
-
-$cgi = new CGI;
-
-$init_data = signup_info( 'agentnum'   => $agentnum,
-                          'promo_code' => scalar($cgi->param('promo_code')),
-                          'reg_code'   => uc(scalar($cgi->param('reg_code'))),
-                        );
-$error = $init_data->{'error'};
-$locales = $init_data->{'cust_main_county'};
-$packages = $init_data->{'part_pkg'};
-$pops = $init_data->{'svc_acct_pop'};
-@payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}};
-$packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum;
-%pop = ();
-%popnum2pop = ();
-foreach (@$pops) {
-  push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
-  $popnum2pop{$_->{popnum}} = $_;
-}
-
-if ( defined $cgi->param('magic') ) {
-  if ( $cgi->param('magic') eq 'process' ) {
-
-    if ( $cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) {
-      $state = $1;
-      $county = $3 || '';
-      $country = $4;
-    } elsif ( $cgi->param('state') =~ /^(\w*)$/ ) {
-      $state = $1;
-      $cgi->param('county') =~ /^([\w ]*)$/
-        or die "illegal county: ". $cgi->param('county');
-      $county = $1;
-      $cgi->param('country') =~ /^(\w+)$/
-        or die "illegal country: ". $cgi->param('country');
-      $country = $1;
-    } else {
-      die "illegal state: ". $cgi->param('state');
-    }
-    if ( $cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) {
-      $ship_state = $1;
-      $ship_county = $3 || '';
-      $ship_country = $4;
-    } elsif ( $cgi->param('ship_state') =~ /^(\w*)$/ ) {
-      $ship_state = $1;
-      $cgi->param('ship_county') =~ /^([\w ]*)$/
-        or die "illegal county: ". $cgi->param('ship_county');
-      $ship_county = $1;
-      #$cgi->param('ship_country') =~ /^(\w+)$/
-      $cgi->param('ship_country') =~ /^(\w*)$/
-        or die "illegal ship_country: ". $cgi->param('ship_country');
-      $ship_country = $1;
-    #} else {
-    #  die "illegal ship_state: ". $cgi->param('ship_state');
-    }
-
-    $payby = $cgi->param('payby');
-    if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
-      #$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) );
-      $payinfo = $cgi->param($payby. '_payinfo1'). '@'. 
-                 $cgi->param($payby. '_payinfo2');
-    } else {
-      $payinfo = $cgi->param( $payby. '_payinfo' );
-    }
-    $paydate =
-      $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' );
-    $payname = $cgi->param( $payby. '_payname' );
-    $paycvv = defined $cgi->param( $payby. '_paycvv' )
-                ? $cgi->param( $payby. '_paycvv' )
-                : '';
-
-    if ( $invoicing_list = $cgi->param('invoicing_list') ) {
-      $invoicing_list .= ', POST' if $cgi->param('invoicing_list_POST');
-    } else {
-      $invoicing_list = 'POST';
-    }
-
-    $error = '';
-
-    $last             = $cgi->param('last');
-    $first            = $cgi->param('first');
-    $ss               = $cgi->param('ss');
-    $company          = $cgi->param('company');
-    $address1         = $cgi->param('address1');
-    $address2         = $cgi->param('address2');
-    $city             = $cgi->param('city');
-    #$county,
-    #$state,
-    $zip              = $cgi->param('zip');
-    #$country,
-    $daytime          = $cgi->param('daytime');
-    $night            = $cgi->param('night');
-    $fax              = $cgi->param('fax');
-
-    $ship_last        = $cgi->param('ship_last');
-    $ship_first       = $cgi->param('ship_first');
-    $ship_ss          = $cgi->param('ship_ss');
-    $ship_company     = $cgi->param('ship_company');
-    $ship_address1    = $cgi->param('ship_address1');
-    $ship_address2    = $cgi->param('ship_address2');
-    $ship_city        = $cgi->param('ship_city');
-    #$ship_county,
-    #$ship_state,
-    $ship_zip         = $cgi->param('ship_zip');
-    #$ship_country,
-    $ship_daytime     = $cgi->param('ship_daytime');
-    $ship_night       = $cgi->param('ship_night');
-    $ship_fax         = $cgi->param('ship_fax');
-
-    #$payby,
-    #$payinfo,
-    #$paydate,
-    #$payname,
-    #$invoicing_list,
-    $referral_custnum = $cgi->param('ref');
-    $pkgpart          = $cgi->param('pkgpart');
-    $username         = $cgi->param('username');
-    $sec_phrase       = $cgi->param('sec_phrase');
-    $password         = $cgi->param('_password');
-    $popnum           = $cgi->param('popnum');
-    #$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
-      $password  = '';
-      $password2 = '';
-    } else {
-      $password2 = $cgi->param('_password2');
-
-      if ( $payby =~ /^(CARD|DCRD)$/ && $cgi->param('CARD_type') ) {
-        $payinfo =~ s/\D//g;
-
-        $payinfo =~ /^(\d{13,16})$/
-          or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
-        $payinfo = $1;
-        validate($payinfo)
-          or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
-        cardtype($payinfo) eq $cgi->param('CARD_type')
-          or $error ||= $init_data->{msgcat}{not_a}. $cgi->param('CARD_type');
-      }
-
-      unless ( $error ) {
-
-        my $r = new_customer ( {
-          'last'             => $last,
-          'first'            => $first,
-          'ss'               => $ss,
-          'company'          => $company,
-          'address1'         => $address1,
-          'address2'         => $address2,
-          'city'             => $city,
-          'county'           => $county,
-          'state'            => $state,
-          'zip'              => $zip,
-          'country'          => $country,
-          'daytime'          => $daytime,
-          'night'            => $night,
-          'fax'              => $fax,
-          'ship_last'        => $ship_last,
-          'ship_first'       => $ship_first,
-          'ship_company'     => $ship_company,
-          'ship_address1'    => $ship_address1,
-          'ship_address2'    => $ship_address2,
-          'ship_city'        => $ship_city,
-          'ship_county'      => $ship_county,
-          'ship_state'       => $ship_state,
-          'ship_zip'         => $ship_zip,
-          'ship_country'     => $ship_country,
-          'ship_daytime'     => $ship_daytime,
-          'ship_night'       => $ship_night,
-          'ship_fax'         => $ship_fax,
-          'payby'            => $payby,
-          'payinfo'          => $payinfo,
-          'paycvv'           => $paycvv,
-          'paydate'          => $paydate,
-          'payname'          => $payname,
-          'invoicing_list'   => $invoicing_list,
-          'referral_custnum' => $referral_custnum,
-          'promo_code'       => scalar($cgi->param('promo_code')),
-          'reg_code'         => uc(scalar($cgi->param('reg_code'))),
-          'pkgpart'          => $pkgpart,
-          'username'         => $username,
-          'sec_phrase'       => $sec_phrase,
-          '_password'        => $password,
-          'popnum'           => $popnum,
-          'agentnum'         => $agentnum,
-          'refnum'           => $refnum,
-          map { $_ => $cgi->param($_) } grep { /^snarf_/ } $cgi->param
-        } );
-        $error ||= $r->{'error'};
-
-      }
-
-    }
-    
-    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();
-    }
-
-  } else {
-    die "unrecognized magic: ". $cgi->param('magic');
-  }
-} else {
-  #$error = '';
-  $last = '';
-  $first = '';
-  $ss = '';
-  $company = '';
-  $address1 = '';
-  $address2 = '';
-  $city = '';
-  $state = $init_data->{statedefault};
-  $county = '';
-  $country = $init_data->{countrydefault};
-  $zip = '';
-  $daytime = '';
-  $night = '';
-  $fax = '';
-  $ship_last = '';
-  $ship_first = '';
-  $ship_company = '';
-  $ship_address1 = '';
-  $ship_address2 = '';
-  $ship_city = '';
-  $ship_state = $init_data->{statedefault};
-  $ship_county = '';
-  $ship_country = $init_data->{countrydefault};
-  $ship_zip = '';
-  $ship_daytime = '';
-  $ship_night = '';
-  $ship_fax = '';
-  $invoicing_list = '';
-  $payby = '';
-  $payinfo = '';
-  $paydate = '';
-  $payname = '';
-  $pkgpart = '';
-  $username = '';
-  $password = '';
-  $password2 = '';
-  $sec_phrase = '';
-  $popnum = '';
-  $referral_custnum = $cgi->param('ref') || '';
-  $init_popstate = $cgi->param('init_popstate') || '';
-  $refnum = $init_data->{'refnum'};
-  print_form;
-}
-
-sub print_form {
-
-  $cgi->delete('ref');
-  $cgi->delete('init_popstate');
-  $self_url = $cgi->self_url;
-
-  $error = "Error: $error" if $error;
-
-  print $cgi->header( '-expires' => 'now' ),
-        $signup_template->fill_in();
-
-}
-
-sub print_decline {
-  print $cgi->header( '-expires' => 'now' ),
-        $decline_template->fill_in();
-}
-
-sub print_okay {
-  my $user_agent = new HTTP::BrowserDetect $ENV{HTTP_USER_AGENT};
-
-  $cgi->param('username') =~ /^(.+)$/
-    or die "fatal: invalid username got past FS::SelfService::new_customer";
-  my $username = $1;
-  $cgi->param('_password') =~ /^(.+)$/
-    or die "fatal: invalid password got past FS::SelfService::new_customer";
-  my $password = $1;
-  ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/
-    or die "fatal: invalid email_name got past FS::SelfService::new_customer";
-  $email_name = $1; #global for template
-
-  my $pop = $popnum2pop{$cgi->param('popnum')};
-    #or die "fatal: invalid popnum got past FS::SelfService::new_customer";
-  if ( $pop ) {
-    ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
-  } else {
-    ( $ac, $exch, $loc ) = ( '', '', ''); #presumably you're not using them.
-  }
-
-  #global for template
-  $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'};
-
-  if ( $ieak_template && $user_agent->windows && $user_agent->ie ) {
-    #send an IEAK config
-    print $cgi->header('application/x-Internet-signup'),
-          $ieak_template->fill_in();
-  } else { #send a simple confirmation
-    print $cgi->header( '-expires' => 'now' ),
-          $success_template->fill_in();
-  }
-}
-
-sub success_default { #html to use if you don't specify a success file
-  <<'END';
-<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
-Thanks for signing up!
-<BR><BR>
-Signup information for <%= $email_name %>:
-<BR><BR>
-Username: <%= $username %><BR>
-Password: <%= $password %><BR>
-Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %><BR>
-Package: <%= $pkg %><BR>
-</BODY></HTML>
-END
-}
-
-sub decline_default { #html to use if there is a decline
-  <<'END';
-<HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR>
-There has been an error processing your account.  Please contact customer
-support.
-</BODY></HTML>
-END
-}
-
-# subs for the templates...
-
-=item regionselector SELECTED_COUNTY, SELECTED_STATE, SELECTED_COUNTRY, PREFIX, ONCHANGE
-
-=cut
-
-sub regionselector {
-  my ( $selected_county, $selected_state, $selected_country,
-       $prefix, $onchange ) = @_;
-  signup_info() unless $init_data;
-  FS::SelfService::regionselector({
-    selected_county  => $selected_county,
-    selected_state   => $selected_state,
-    selected_country => $selected_country,
-    prefix           => $prefix,
-    onchange         => $onchange,
-    default_country  => $init_data->{countrydefault},
-    locales          => $init_data->{cust_main_county},
-  });
-    #default_state    => $init_data->{statedefault},
-}
-
-=item popselector 
-
-=cut
-
-sub popselector {
-  my( $popnum ) = @_;
-  signup_info() unless $init_data;
-  FS::SelfService::popselector({
-    popnum => $popnum,
-    pops   => $init_data->{svc_acct_pop},
-  });
-    #popac =>
-    #acstate =>
-}
-
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
deleted file mode 100755
index da522f4f4..000000000
--- a/fs_signup/FS-SignupClient/cgi/signup.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8" onUnload="myclose()">
-<script language="JavaScript"><!--
-  var mywindow = -1;
-  function myopen(filename,windowname,properties) {
-    myclose();
-    mywindow = window.open(filename,windowname,properties);
-  }
-  function myclose() {
-    if ( mywindow != -1 )
-      mywindow.close();
-    mywindow = -1
-  }
-//--></script>
-<FONT SIZE=7>ISP Signup form</FONT><BR><BR>
-<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM NAME="OneTrueForm" ACTION="<%= $self_url %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
-<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
-<INPUT TYPE="hidden" NAME="ss" VALUE="">
-Where did you hear about our service? <SELECT NAME="refnum">
-<%=
-  $OUT .= '<OPTION VALUE="">' unless $refnum;
-  foreach my $part_referral ( @{$init_data->{'part_referral'}} ) {
-    $OUT .= '<OPTION VALUE="'. $part_referral->{'refnum'}. '"';
-    $OUT .= ' SELECTED' if $part_referral->{'refnum'} eq $refnum;
-    $OUT .= '>'. $part_referral->{'referral'};
-  }
-%>
-</SELECT><BR><BR>
-Contact Information
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
-                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
-  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
-  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
-  <TD>
-    <%=
-        ($county_html, $state_html, $country_html) =
-          regionselector( $county, $state, $country );
- 
-        "$county_html $state_html";
-    %>
-  </TD>
-  <TH><font color="#ff0000">*</font>Zip</TH>
-  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
-</TR>
-<TR>
-  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
-  <TD><%= $country_html %></TD>
-<TR>
-  <TD ALIGN="right">Day Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Night Phone</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Fax</TD>
-  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
-</TR>
-</TABLE><font color="#ff0000">*</font> required fields<BR>
-<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR><TD>
-
-  <%=
-    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
-    my @invoicing_list = split(', ', $invoicing_list );
-    $OUT .= ' CHECKED'
-      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
-    $OUT .= '>';
-  %>
-
-  Postal mail invoice
-</TD></TR>
-<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
-</TD></TR>
-<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
-</TABLE>
-<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
-<TR>
-
-  <%=
-
-    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-    my %types = (
-                  'VISA' => 'VISA card',
-                  'MasterCard' => 'MasterCard',
-                  'Discover' => 'Discover card',
-                  'American Express' => 'American Express card',
-                );
-    foreach ( keys %types ) {
-      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
-      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
-    }
-    $cardselect .= '</SELECT>';
-  
-    my %payby = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
-    );
-
-    if ( $init_data->{'cvv_enabled'} ) {
-      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
-        $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
-      }
-    }
-
-    my( $account, $aba ) = split('@', $payinfo);
-    my %paybychecked = (
-      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
-      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
-      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
-    );
-
-    if ( $init_data->{'cvv_enabled'} ) {
-      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
-        $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
-      }
-    }
-
-    for (@payby) {
-      if ( scalar(@payby) == 1) {
-        $OUT .= '<TD VALIGN=TOP>'.
-                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
-                "$paybychecked{$_}</TD>";
-      } else {
-        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-        if ($payby eq $_) {
-          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
-        } else {
-          $OUT .= qq!> $payby{$_}</TD>!;
-        }
-
-      }
-    }
-  %>
-
-</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
-<BR><BR>First package
-<INPUT TYPE="hidden" NAME="promo_code" VALUE="<%= $cgi->param('promo_code') %>">
-<INPUT TYPE="hidden" NAME="reg_code" VALUE="<%= uc($cgi->param('reg_code')) %>">
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
-<TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart">
-
-  <%=
-    $OUT .= '<OPTION VALUE="">(none)' unless scalar(@$packages) == 1;
-    foreach my $package ( @{$packages} ) {
-      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
-      $OUT .= ' SELECTED'
-        if ( $pkgpart && $package->{'pkgpart'} == $pkgpart )
-           || scalar(@$packages) == 1;
-      $OUT .= '>'. $package->{'pkg'};
-    }
-  %>
-
-  </SELECT></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Re-enter Password</TD>
-  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
-</TR>
-<%=
-  if ( $init_data->{'security_phrase'} ) {
-    $OUT .= <<ENDOUT;
-<TR>
-  <TD ALIGN="right">Security Phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
-  </TD>
-</TR>
-ENDOUT
-  } else {
-    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
-  }
-%>
-<%=
-  if ( scalar(@$pops) ) {
-    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
-            popselector($popnum). '</TD></TR>';
-  } else {
-    $OUT .= popselector($popnum);
-  }
-%>
-</TABLE>
-<BR><BR><INPUT TYPE="submit" NAME="signup" VALUE="Signup">
-</FORM></BODY></HTML>
diff --git a/fs_signup/FS-SignupClient/test.pl b/fs_signup/FS-SignupClient/test.pl
deleted file mode 100644
index b6136954d..000000000
--- a/fs_signup/FS-SignupClient/test.pl
+++ /dev/null
@@ -1,20 +0,0 @@
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl test.pl'
-
-######################### We start with some black magic to print on failure.
-
-# Change 1..1 below to 1..last_test_to_print .
-# (It may become useful if the test is moved to ./t subdirectory.)
-
-BEGIN { $| = 1; print "1..1\n"; }
-END {print "not ok 1\n" unless $loaded;}
-#blah#use FS::SignupClient;
-$loaded = 1;
-print "ok 1\n";
-
-######################### End of black magic.
-
-# Insert your test code below (better if it prints "ok 13"
-# (correspondingly "not ok 13") depending on the success of chunk 13
-# of the test code):
-
diff --git a/fs_signup/cck.template b/fs_signup/cck.template
deleted file mode 100644
index f1db554b1..000000000
--- a/fs_signup/cck.template
+++ /dev/null
@@ -1,14 +0,0 @@
-SITE_FILE	8chrfile
-SITE_NAME	YourISP
-LOGIN	{ $username }
-PASSWORD	{ $password }
-PHONE_NUM	+1({ $ac }){ $exch }-{ $loc }
-DNS_ADDR	10.0.0.1
-DNS_ADDR2	10.0.0.2
-NNTP_HOST	news.yourisp.com
-SMTP_HOST	mail.yourisp.com
-DOMAIN_NAME	yourisp.com
-POP_SERVER	{ $username }@mail.yourisp.com
-POP_PASSWORD	{ $password }
-HOME_URL	http://www.yourisp.com
-EMAIL_ADDR	{ $username }@yourisp.com
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
deleted file mode 100755
index d6eb4a8d5..000000000
--- a/fs_signup/fs_signup_server
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# fs_signup_server
-#
-
-use strict;
-use vars qw($pid);
-use IO::Handle;
-use Storable qw(nstore_fd fd_retrieve);
-use Tie::RefHash;
-use Net::SSH qw(sshopen2);
-use FS::UID qw(adminsuidsetup);
-use FS::Conf;
-use FS::Record qw( qsearch qsearchs );
-use FS::cust_main_county;
-use FS::cust_main;
-use FS::cust_bill;
-use FS::cust_pkg;
-use FS::Msgcat qw(gettext);
-
-use vars qw( $opt $Debug );
-
-$Debug = 2;
-
-my $user = shift or die &usage;
-&adminsuidsetup( $user ); 
-
-my $conf = new FS::Conf;
-
-if ($conf->exists('signup_server-quiet')) {
-    $FS::cust_bill::quiet = 1;
-    $FS::cust_pkg::quiet = 1;
-}
-
-#my @payby = qw(CARD PREPAY);
-my @payby = $conf->config('signup_server-payby');
-my $smtpmachine = $conf->config('smtpmachine');
-
-my $machine = shift or die &usage;
-
-my $agentnum = shift or die &usage;
-my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage;
-my $pkgpart_href = $agent->pkgpart_hashref;
-
-my $refnum = shift or die &usage;
-
-#causing trouble for some folks
-#$SIG{CHLD} = sub { wait() };
-
-$SIG{HUP} = \&killssh;
-$SIG{INT} = \&killssh;
-$SIG{QUIT} = \&killssh;
-$SIG{TERM} = \&killssh;
-$SIG{PIPE} = \&killssh;
-sub killssh { kill 'TERM', $pid if $pid; exit; };
-
-my($fs_signupd)="/usr/local/sbin/fs_signupd";
-
-while (1) {
-  my($reader,$writer)=(new IO::Handle, new IO::Handle);
-  #seems to be broken - calling ->flush explicitly# $writer->autoflush(1);
-  warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
-  $pid = sshopen2($machine,$reader,$writer,$fs_signupd);
-
-  my @pops = qsearch('svc_acct_pop',{} );
-  my $init_data = {
-
-    #'_protocol' => 'signup',
-    #'_version' => '0.1',
-    #'_packet' => 'init'
-  
-    'cust_main_county' =>
-      [ map { $_->hashref } qsearch('cust_main_county', {}) ],
-      
-    'part_pkg' =>
-      [
-        #map { $_->hashref }
-        map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
-          grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } }
-            qsearch( 'part_pkg', { 'disabled' => '' } )
-      ],
-
-    'agentnum2part_pkg' =>
-      {
-        map {
-          my $href = $_->pkgpart_hashref;
-          $_->agentnum =>
-            [
-              map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
-                grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } }
-                  qsearch( 'part_pkg', { 'disabled' => '' } )
-            ];
-        } qsearch('agent', {} )
-      },
-
-    'svc_acct_pop' => [ map { $_->hashref } @pops ],
-
-    'security_phrase' => $conf->exists('security_phrase'),
-
-    'payby' => [ $conf->config('signup_server-payby') ],
-
-    'msgcat' => { map { $_=>gettext($_) } qw(
-      passwords_dont_match invalid_card unknown_card_type not_a
-    ) },
-
-    'statedefault' => $conf->config('statedefault') || 'CA',
-
-    'countrydefault' => $conf->config('countrydefault') || 'US',
-
-  };
-
-  warn "[fs_signup_server] Sending init data...\n" if $Debug;
-  nstore_fd($init_data, $writer) or die "can't send init data: $!";
-  $writer->flush;
-
-  warn "[fs_signup_server] Entering main loop...\n" if $Debug;
-  while (1) {
-    warn "[fs_signup_server] Reading (waiting for) signup data...\n" if $Debug;
-    my $signup_data = fd_retrieve($reader);
-
-    if ( $Debug > 1 ) {
-      warn join('',
-        map { "  $_ => ". $signup_data->{$_}. "\n" } keys %$signup_data );
-    }
-
-    warn "[fs_signup_server] Processing signup...\n" if $Debug;
-
-    my $error = '';
-
-    #things that aren't necessary in base class, but are for signup server
-      #return "Passwords don't match"
-      #  if $hashref->{'_password'} ne $hashref->{'_password2'}
-    $error ||= gettext('empty_password') unless $signup_data->{'_password'};
-    $error ||= gettext('no_access_number_selected')
-      unless $signup_data->{'popnum'} || !scalar(@pops);
-
-    #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
-    # common that are still here and library them.
-    my $cust_main = new FS::cust_main ( {
-      #'custnum'          => '',
-      'agentnum'         => $signup_data->{agentnum} || $agentnum,
-      'refnum'           => $refnum,
-
-      map { $_ => $signup_data->{$_} } qw(
-        last first ss company address1 address2 city county state zip country
-        daytime night fax payby payinfo paydate payname referral_custnum comments
-      ),
-
-    } );
-
-    $error ||= "Illegal payment type"
-      unless grep { $_ eq $signup_data->{'payby'} } @payby;
-
-    $cust_main->payinfo($cust_main->daytime)
-      if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo;
-
-    my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
-
-    $signup_data->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
-    my $pkgpart = $1;
-
-    my $part_pkg =
-      qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
-        or $error ||= "WARNING: unknown pkgpart: $pkgpart";
-    my $svcpart = $part_pkg->svcpart('svc_acct') unless $error;
-
-    my $cust_pkg = new FS::cust_pkg ( {
-      #later#'custnum' => $custnum,
-      'pkgpart' => $signup_data->{'pkgpart'},
-    } );
-    $error ||= $cust_pkg->check;
-
-    my $svc_acct = new FS::svc_acct ( {
-      'svcpart'   => $svcpart,
-      map { $_ => $signup_data->{$_} }
-        qw( username _password sec_phrase popnum ),
-    } );
-
-    my $y = $svc_acct->setdefault; # arguably should be in new method
-    $error ||= $y unless ref($y);
-
-    $error ||= $svc_acct->check;
-
-    use Tie::RefHash;
-    tie my %hash, 'Tie::RefHash';
-    %hash = ( $cust_pkg => [ $svc_acct ] );
-    $error ||= $cust_main->insert( \%hash, \@invoicing_list ); #msgcat
-
-    if ( ! $error && $conf->exists('signup_server-realtime') ) {
-
-      warn "[fs_signup_server] Billing customer...\n" if $Debug;
-
-      my $bill_error = $cust_main->bill;
-      warn "[fs_signup_server] error billing new customer: $bill_error"
-        if $bill_error;
-
-      $cust_main->apply_payments;
-      $cust_main->apply_credits;
-
-      $bill_error = $cust_main->collect;
-      warn "[fs_signup_server] error collecting from new customer: $bill_error"
-        if $bill_error;
-
-      if ( $cust_main->balance > 0 ) {
-
-        #this makes sense.  credit is "un-doing" the invoice
-        $cust_main->credit( $cust_main->balance, 'signup server decline' );
-        $cust_main->apply_credits;
-
-        #should check list for errors...
-        #$cust_main->suspend;
-        $cust_main->cancel;
-
-        $error = '_decline';
-      }
-    }
-
-    warn "[fs_signup_server] Sending results...\n" if $Debug;
-    print $writer $error, "\n";
-
-    next if $error;
-
-    if ( $conf->config('signup_server-email') ) {
-      warn "[fs_signup_server] Sending email...\n" if $Debug;
-
-      #false laziness w/FS::cust_bill::send & FS::cust_pay::delete
-      use Mail::Header;
-      use Mail::Internet 1.44;
-      use Date::Format;
-      my $from = $conf->config('invoice_from'); #??? as good as any
-      $ENV{MAILADDRESS} = $from;
-      my $header = new Mail::Header ( [
-        "From: $from",
-        "To: ". $conf->config('signup_server-email'),
-        "Sender: $from",
-        "Reply-To: $from",
-        "Date: ". time2str("%a, %d %b %Y %X %z", time),
-        "Subject: FREESIDE NOTIFICATION: Signup Server",
-      ] );
-      my $body = [
-        "This is an automatic message from your Freeside installation\n",
-        "informing you a customer has signed up via the signup server:\n",
-        "\n",
-        'custnum     : '. $cust_main->custnum. "\n",
-        'Name        : '. $cust_main->last. ", ". $cust_main->first. "\n",
-        'Agent       : '. $cust_main->agent->agent. "\n",
-        'Package     : '. $part_pkg->pkg. ' - '. $part_pkg->comment. "\n",
-        'Signup Date : '. time2str('%C', time). "\n",
-        'Username    : '. $svc_acct->username. "\n",
-        #'Password    : '. # config file to turn this on if noment insists
-        'Day phone   : '. $cust_main->daytime. "\n",
-        'Night phone : '. $cust_main->night. "\n",
-        'Address     : '. $cust_main->address1. "\n",
-        ( $cust_main->address2
-            ? '              '. $cust_main->address2. "\n"
-            : ''                                           ),
-        '              '. $cust_main->city. ', '. $cust_main->state. '  '.
-                          $cust_main->zip. "\n",
-        ( $cust_main->country eq 'US'
-            ? ''
-            : '              '. $cust_main->country. "\n" ),
-        "\n",
-      ];
-      #if ( $cust_main->balance > 0 ) {
-      #  push @$body,
-      #    "This customer has an outstanding balance and has been suspended.\n";
-      #}
-      my $message = new Mail::Internet ( 'Header' => $header, 'Body' => $body );
-      $!=0;
-      $message->smtpsend( Host => $smtpmachine )
-        or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-          or warn "[fs_signup_server] can't send email to ".
-                   $conf->config('signup_server-email').
-                   " via server $smtpmachine with SMTP: $!";
-      #end-of-send mail
-    }
-
-  }
-  close $writer;
-  close $reader;
-  warn "connection to $machine lost!  waiting 60 seconds...\n";
-  sleep 60;
-  warn "reconnecting...\n";
-}
-
-sub usage {
-  die "Usage:\n\n  fs_signup_server user machine agentnum refnum\n";
-}
-
diff --git a/fs_signup/ieak.template b/fs_signup/ieak.template
deleted file mode 100755
index 52edaa951..000000000
--- a/fs_signup/ieak.template
+++ /dev/null
@@ -1,40 +0,0 @@
-[Entry]
-Entry_Name = The Internet
-[Phone]
-Dial_As_Is=no
-Phone_Number = { $exch. $loc }
-Area_Code = { $ac }
-Country_Code = 1
-Country_Id = 1
-[Server]
-Type = PPP
-SW_Compress = Yes
-PW_Encrypt = Yes
-Negotiate_TCP/IP = Yes
-Disable_LCP = No
-[TCP/IP]
-Specify_IP_Address = No
-Specity_Server_Address = No
-IP_Header_Compress = Yes
-Gateway_On_Remote = Yes
-[User]
-Name = { $username }
-Password = { $password }
-Display_Password = Yes
-[Internet_Mail]
-Email_Name = { $email_name }
-Email_Address = { $username }\@domain.tld
-POP_Server = mail.domain.tld
-POP_Server_Port_Number = 110
-POP_Login_Name = { $username }
-POP_Login_Password = { $password }
-SMTP_Server = mail.domain.tld
-SMTP_Server_Port_Number = 25
-Install_Mail = 1
-[Internet_News]
-NNTP_Server = news.domain.tld
-NNTP_Server_Port_Number = 119
-Logon_Required = No
-Install_News = 1
-[Branding]
-Window_Title = The Internet
diff --git a/htetc/global.asa b/htetc/global.asa
index ed26057ea..3781f947d 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -10,6 +10,7 @@ use CGI 2.47;
 use Date::Format;
 use Date::Parse;
 use Time::Local;
+use Time::Duration;
 use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index f41db36ec..c144eca1a 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -93,6 +93,7 @@ sub handler
       use Date::Format;
       use Date::Parse;
       use Time::Local;
+      use Time::Duration;
       use Tie::IxHash;
       use HTML::Entities;
       use IO::Handle;
-- 
2.11.0