X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=fs_signup%2FFS-SignupClient%2Fcgi%2Fsignup.cgi;h=08d8a4d45e33b6040dd34a10d26d972f6b7b2163;hp=b236e6fb2ed53cc2177bd8cecd30556a4de83dc9;hb=269525075ed77bfcd0a26eda9c7244e816aba92d;hpb=e8116f5d849f479f03294232e25c41c3d82b50f2 diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi index b236e6fb2..08d8a4d45 100755 --- a/fs_signup/FS-SignupClient/cgi/signup.cgi +++ b/fs_signup/FS-SignupClient/cgi/signup.cgi @@ -1,24 +1,31 @@ #!/usr/bin/perl -Tw # -# $Id: signup.cgi,v 1.15 2001-09-27 21:37:57 ivan Exp $ +# $Id: signup.cgi,v 1.29 2002-05-30 22:45:20 ivan Exp $ use strict; -use vars qw( @payby $cgi $locales $packages $pops $error +use vars qw( @payby $cgi $locales $packages $pops $init_data $error $last $first $ss $company $address1 $address2 $city $state $county $country $zip $daytime $night $fax $invoicing_list $payby $payinfo $paydate $payname $referral_custnum - $pkgpart $username $password $popnum + $pkgpart $username $password $password2 $sec_phrase $popnum + $agentnum $ieak_file $ieak_template $cck_file $cck_template - $signup_html $signup_template $success_html $success_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 expselect signup_default success_default ); +use subs qw( print_form print_okay print_decline + signup_default success_default decline_default + expselect ); use CGI; -use CGI::Carp qw(fatalsToBrowser); -use HTTP::Headers::UserAgent 2.00; -use FS::SignupClient 0.02 qw( signup_info new_customer ); +#use CGI::Carp qw(fatalsToBrowser); use Text::Template; +use Business::CreditCard; +use HTTP::Headers::UserAgent 2.00; +use FS::SignupClient 0.03 qw( signup_info new_customer ); #acceptable payment methods # @@ -29,14 +36,24 @@ use Text::Template; $ieak_file = '/usr/local/freeside/ieak.template'; $cck_file = '/usr/local/freeside/cck.template'; -$signup_html = '/usr/local/freeside/signup.html'; -$success_html = '/usr/local/freeside/success.html'; +$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 { @@ -54,6 +71,7 @@ if ( -e $cck_file ) { $cck_template = ''; } +$agentnum = ''; if ( -e $signup_html ) { my $signup_txt = Text::Template::_load_text($signup_html) or die $Text::Template::ERROR; @@ -64,6 +82,11 @@ if ( -e $signup_html ) { DELIMITERS => [ '<%=', '%>' ] ) or die $Text::Template::ERROR; + if ( $signup_txt =~ + /<\s*INPUT TYPE="?hidden"?\s+NAME="?agentnum"?\s+VALUE="?(\d+)"?\s*>/si + ) { + $agentnum = $1; + } } else { $signup_template = new Text::Template ( TYPE => 'STRING', SOURCE => &signup_default, @@ -90,7 +113,28 @@ if ( -e $success_html ) { or die $Text::Template::ERROR; } -( $locales, $packages, $pops ) = signup_info(); +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; +} + + +( $locales, $packages, $pops, $init_data ) = signup_info(); +@payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}}; +$packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum; $cgi = new CGI; @@ -115,37 +159,93 @@ if ( defined $cgi->param('magic') ) { $invoicing_list = 'POST'; } - $error = new_customer ( { - 'last' => $last = $cgi->param('last'), - 'first' => $first = $cgi->param('first'), - 'ss' => $ss = $cgi->param('ss'), - 'company' => $company = $cgi->param('company'), - 'address1' => $address1 = $cgi->param('address1'), - 'address2' => $address2 = $cgi->param('address2'), - 'city' => $city = $cgi->param('city'), - 'county' => $county, - 'state' => $state, - 'zip' => $zip = $cgi->param('zip'), - 'country' => $country, - 'daytime' => $daytime = $cgi->param('daytime'), - 'night' => $night = $cgi->param('night'), - 'fax' => $fax = $cgi->param('fax'), - 'payby' => $payby, - 'payinfo' => $payinfo, - 'paydate' => $paydate, - 'payname' => $payname, - 'invoicing_list' => $invoicing_list, - 'referral_custnum' => $referral_custnum = $cgi->param('ref'), - 'pkgpart' => $pkgpart = $cgi->param('pkgpart'), - 'username' => $username = $cgi->param('username'), - '_password' => $password = $cgi->param('_password'), - 'popnum' => $popnum = $cgi->param('popnum'), - } ); - if ( $error ) { + $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'); + #$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'), + + 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 eq 'CARD' && $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'); + } + + $error ||= 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, + 'payby' => $payby, + 'payinfo' => $payinfo, + 'paydate' => $paydate, + 'payname' => $payname, + 'invoicing_list' => $invoicing_list, + 'referral_custnum' => $referral_custnum, + 'pkgpart' => $pkgpart, + 'username' => $username, + 'sec_phrase' => $sec_phrase, + '_password' => $password, + 'popnum' => $popnum, + 'agentnum' => $agentnum, + } ); + + } + + if ( $error eq '_decline' ) { + print_decline(); + } elsif ( $error ) { print_form(); } else { print_okay(); } + } else { die "unrecognized magic: ". $cgi->param('magic'); } @@ -173,6 +273,8 @@ if ( defined $cgi->param('magic') ) { $pkgpart = ''; $username = ''; $password = ''; + $password2 = ''; + $sec_phrase = ''; $popnum = ''; $referral_custnum = $cgi->param('ref') || ''; print_form; @@ -190,6 +292,11 @@ sub print_form { } +sub print_decline { + print $cgi->header( '-expires' => 'now' ), + $decline_template->fill_in(); +} + sub print_okay { my $user_agent = new HTTP::Headers::UserAgent $ENV{HTTP_USER_AGENT}; @@ -200,12 +307,19 @@ sub print_okay { or die "fatal: invalid password got past FS::SignupClient::new_customer"; my $password = $1; ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/ - or die "fatal: invalid email_name got past FS::SignupCLient::new_customer"; - my $email_name = $1; + or die "fatal: invalid email_name got past FS::SignupClient::new_customer"; + $email_name = $1; #global for template + + my $pop = pop_info($cgi->param('popnum')); + #or die "fatal: invalid popnum got past FS::SignupClient::new_customer"; + if ( $pop ) { + ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} ); + } else { + ( $ac, $exch, $loc ) = ( '', '', ''); #presumably you're not using them. + } - my $pop = pop_info($cgi->param('popnum')) - or die "fatal: invalid popnum got past FS::SignupClient::new_customer"; - ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} ); + #global for template + $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'}; if ( $ieak_template && $user_agent->platform eq 'ia32' @@ -247,6 +361,12 @@ sub pop_info { sub popselector { my( $popnum, $state ) = @_; + return '' unless @$pops; + return $pops->[0]{city}. ', '. $pops->[0]{state}. + ' ('. $pops->[0]{ac}. ')/'. $pops->[0]{exch}. + '' + if scalar(@$pops) == 1; + my %pop = (); push @{ $pop{$_->{state}} }, $_ foreach @$pops; @@ -329,6 +449,23 @@ sub success_default { #html to use if you don't specify a success file Signup successful Signup successful

Thanks for signing up! +

+Signup information for <%= $email_name %>: +

+Username: <%= $username %>
+Password: <%= $password %>
+Access number: (<%= $ac %>) / $exch - $local
+Package: <%= $pkg %>
+ +END +} + +sub decline_default { #html to use if there is a decline + <<'END'; +Processing error +Processing error

+There has been an error processing your account. Please contact customer +support. END } @@ -412,31 +549,53 @@ Contact Information Email invoice -Billing type +<%= scalar(@payby) > 1 ? 'Billing type' : '' %> + <%= + + my $cardselect = ''; + my %payby = ( - 'CARD' => qq!Credit card
*
*Exp !. expselect("CARD"). qq!
*Name on card
!, + 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD"). qq!
*Name on card
!, 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", "12-2037"). qq!
*Attention
!, 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP"), 'PREPAY' => qq!Prepaid card
*!, ); my %paybychecked = ( - 'CARD' => qq!Credit card
*
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, + 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", $paydate). qq!
*Attention
!, 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP", $paydate), 'PREPAY' => qq!Prepaid card
*!, ); for (@payby) { - $OUT .= qq!!; + if ( scalar(@payby) == 1) { + $OUT .= '"; } else { - $OUT .= qq!> $payby{$_}!; + $OUT .= qq!!; + } else { + $OUT .= qq!> $payby{$_}!; + } + } } %> @@ -463,13 +622,33 @@ Contact Information - + - - + + +<%= + if ( $init_data->{'security_phrase'} ) { + $OUT .= < + + + +ENDOUT + } else { + $OUT .= ''; + } +%> +<%= + if ( scalar(@$pops) ) { + $OUT .= ''; + } else { + $OUT .= popselector($popnum); + } +%>
$paybychecked{$_}'. + qq!!. + "$paybychecked{$_} $paybychecked{$_}
Password - (blank to generate)
Access number<%= popselector($popnum) %>Re-enter Password
Security Phrase +
Access number'. + popselector($popnum). '