summaryrefslogtreecommitdiff
path: root/fs_signup/FS-SignupClient/cgi/signup.cgi
diff options
context:
space:
mode:
Diffstat (limited to 'fs_signup/FS-SignupClient/cgi/signup.cgi')
-rwxr-xr-xfs_signup/FS-SignupClient/cgi/signup.cgi118
1 files changed, 40 insertions, 78 deletions
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
index 0a9a51008..28dc4c95b 100755
--- a/fs_signup/FS-SignupClient/cgi/signup.cgi
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: signup.cgi,v 1.50 2004-01-04 03:52:54 ivan Exp $
+# $Id: signup.cgi,v 1.29.2.21 2004-01-04 03:52:57 ivan Exp $
use strict;
use vars qw( @payby $cgi $locales $packages
@@ -130,7 +130,8 @@ $packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum;
%pop = ();
%popnum2pop = ();
foreach (@$pops) {
- push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
+ #push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
+ push @{ $pop{ $_->{state} } }, $_;
$popnum2pop{$_->{popnum}} = $_;
}
@@ -156,10 +157,9 @@ if ( defined $cgi->param('magic') ) {
}
$payby = $cgi->param('payby');
- if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
+ if ( $payby eq 'CHEK' ) {
#$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) );
- $payinfo = $cgi->param($payby. '_payinfo1'). '@'.
- $cgi->param($payby. '_payinfo2');
+ $payinfo = $cgi->param('CHEK_payinfo1').'@'.$cgi->param('CHEK_payinfo2');
} else {
$payinfo = $cgi->param( $payby. '_payinfo' );
}
@@ -215,7 +215,7 @@ if ( defined $cgi->param('magic') ) {
} else {
$password2 = $cgi->param('_password2');
- if ( $payby =~ /^(CARD|DCRD)$/ && $cgi->param('CARD_type') ) {
+ if ( $payby eq 'CARD' && $cgi->param('CARD_type') ) {
$payinfo =~ s/\D//g;
$payinfo =~ /^(\d{13,16})$/
@@ -284,7 +284,7 @@ if ( defined $cgi->param('magic') ) {
$address1 = '';
$address2 = '';
$city = '';
- $state = $init_data->{statedefault};
+ $state = $cgi->param('init_popstate') || $init_data->{statedefault};
$county = '';
$country = $init_data->{countrydefault};
$zip = '';
@@ -362,8 +362,7 @@ sub print_okay {
#horrible false laziness with FS/FS/svc_acct_pop.pm::popselector
sub popselector {
-
- my( $popnum ) = @_;
+ my( $popnum, $state ) = @_;
return '<INPUT TYPE="hidden" NAME="popnum" VALUE="">' unless @$pops;
return $pops->[0]{city}. ', '. $pops->[0]{state}.
@@ -372,96 +371,61 @@ sub popselector {
if scalar(@$pops) == 1;
#my %pop = ();
- #my %popnum2pop = ();
- #foreach (@$pops) {
- # push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
- # $popnum2pop{$_->{popnum}} = $_;
- #}
+ #push @{ $pop{$_->{state}} }, $_ foreach @$pops;
- my $text = <<END;
- <SCRIPT>
- function opt(what,href,text) {
- var optionName = new Option(text, href, false, false)
- var length = what.length;
- what.options[length] = optionName;
- }
-END
+ my $text;
if ( $init_popstate ) {
$text .= '<INPUT TYPE="hidden" NAME="init_popstate" VALUE="'.
$init_popstate. '">';
} else {
$text .= <<END;
- function acstate_changed(what) {
- state = what.options[what.selectedIndex].text;
- what.form.popac.options.length = 0
- what.form.popac.options[0] = new Option("Area code", "-1", false, true);
-END
- }
-
- my @states = $init_popstate ? ( $init_popstate ) : keys %pop;
- foreach my $state ( sort { $a cmp $b } @states ) {
- $text .= "\nif ( state == \"$state\" ) {\n" unless $init_popstate;
-
- foreach my $ac ( sort { $a cmp $b } keys %{ $pop{$state} }) {
- $text .= "opt(what.form.popac, \"$ac\", \"$ac\");\n";
- if ($ac eq $cgi->param('popac')) {
- $text .= "what.form.popac.options[what.form.popac.length-1].selected = true;\n";
+ <SCRIPT>
+ function opt(what,href,text) {
+ var optionName = new Option(text, href, false, false)
+ var length = what.length;
+ what.options[length] = optionName;
}
- }
- $text .= "}\n" unless $init_popstate;
- }
- $text .= "popac_changed(what.form.popac)}\n";
-
- $text .= <<END;
- function popac_changed(what) {
- ac = what.options[what.selectedIndex].text;
- what.form.popnum.options.length = 0;
- what.form.popnum.options[0] = new Option("City", "-1", false, true);
-
+ function popstate_changed(what) {
+ state = what.options[what.selectedIndex].text;
+ what.form.popnum.options.length = 0;
+ what.form.popnum.options[0] = new Option("", "", false, true);
END
- foreach my $state ( @states ) {
- foreach my $popac ( keys %{ $pop{$state} } ) {
- $text .= "\nif ( ac == \"$popac\" ) {\n";
+ foreach my $popstate ( sort { $a cmp $b } keys %pop ) {
+ $text .= "\nif ( state == \"$popstate\" ) {\n";
- foreach my $pop ( @{$pop{$state}->{$popac}}) {
+ foreach my $pop ( @{$pop{$popstate}}) {
my $o_popnum = $pop->{popnum};
my $poptext = $pop->{city}. ', '. $pop->{state}.
' ('. $pop->{ac}. ')/'. $pop->{exch}. '-'. $pop->{loc};
- $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n";
- if ($popnum == $o_popnum) {
- $text .= "what.form.popnum.options[what.form.popnum.length-1].selected = true;\n";
- }
+ $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
}
$text .= "}\n";
}
- }
-
-
- $text .= "}\n</SCRIPT>\n";
-
- $text .=
- qq!<TABLE CELLPADDING="0"><TR><TD><SELECT NAME="acstate"! .
- qq!SIZE=1 onChange="acstate_changed(this)"><OPTION VALUE=-1>State!;
- $text .= "<OPTION" . ($_ eq $cgi->param('acstate') ? " SELECTED" : "") .
- ">$_" foreach sort { $a cmp $b } @states;
- $text .= '</SELECT>'; #callback? return 3 html pieces? #'</TD>';
- $text .=
- qq!<SELECT NAME="popac" SIZE=1 onChange="popac_changed(this)">!.
- qq!<OPTION>Area code</SELECT></TR><TR VALIGN="top">!;
+ $text .= "}\n</SCRIPT>\n";
- $text .= qq!<TR><TD><SELECT NAME="popnum" SIZE=1 STYLE="width: 20em"><OPTION>City!;
+ $text .=
+ qq!<SELECT NAME="popstate" SIZE=1 onChange="popstate_changed(this)">!.
+ qq!<OPTION> !;
+ $text .= "<OPTION>$_" foreach sort { $a cmp $b } keys %pop;
+ $text .= '</SELECT>'; #callback? return 3 html pieces? #'</TD><TD>';
+ }
+ $text .= qq!<SELECT NAME="popnum" SIZE=1><OPTION> !;
- #comment this block to disable initial list polulation
+ #comment this block to disable initial list population
my @initial_select = ();
- if ( scalar( @$pops ) > 100 ) {
- push @initial_select, $popnum2pop{$popnum} if $popnum2pop{$popnum};
+ if ( $init_popstate ) {
+ @initial_select = grep { $_->{state} eq $init_popstate } @$pops;
} else {
- @initial_select = @$pops;
+ if ( scalar( @$pops ) > 100 ) {
+ push @initial_select, $popnum2pop{$popnum} if $popnum2pop{$popnum};
+ } else {
+ @initial_select = @$pops;
+ }
}
foreach my $pop ( sort { $a->{state} cmp $b->{state} } @initial_select ) {
$text .= qq!<OPTION VALUE="!. $pop->{popnum}. '"'.
@@ -469,11 +433,9 @@ END
$pop->{city}. ', '. $pop->{state}.
' ('. $pop->{ac}. ')/'. $pop->{exch}. '-'. $pop->{loc};
}
-
- $text .= qq!</SELECT></TD></TR></TABLE>!;
+ $text .= '</SELECT>';
$text;
-
}
sub expselect {
generated by cgit v1.2.1 (git 2.18.0) at 2025-08-02 04:17:48 +0000