diff options
Diffstat (limited to 'fs_signup')
| -rwxr-xr-x | fs_signup/FS-SignupClient/cgi/signup.cgi | 5 | ||||
| -rwxr-xr-x | fs_signup/fs_signup_server | 31 | ||||
| -rwxr-xr-x | fs_signup/ieak.template | 80 |
3 files changed, 67 insertions, 49 deletions
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi index 009a633..08d8a4d 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.27 2002-04-25 12:03:15 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 $init_data $error @@ -46,11 +46,14 @@ $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 { diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server index 70045e6..7f962e0 100755 --- a/fs_signup/fs_signup_server +++ b/fs_signup/fs_signup_server @@ -205,7 +205,7 @@ while (1) { #false laziness w/FS::cust_bill::send & FS::cust_pay::delete use Mail::Header; - use Mail::Internet; + use Mail::Internet 1.44; use Date::Format; my $from = $conf->config('invoice_from'); #??? as good as any $ENV{MAILADDRESS} = $from; @@ -221,15 +221,30 @@ while (1) { "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", + '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"; - } + #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 ) diff --git a/fs_signup/ieak.template b/fs_signup/ieak.template index 5da2a20..52edaa9 100755 --- a/fs_signup/ieak.template +++ b/fs_signup/ieak.template @@ -1,40 +1,40 @@ -[Entry]\r -Entry_Name = The Internet\r -[Phone]\r -Dial_As_Is=no\r -Phone_Number = { $exch. $loc }\r -Area_Code = { $ac }\r -Country_Code = 1\r -Country_Id = 1\r -[Server]\r -Type = PPP\r -SW_Compress = Yes\r -PW_Encrypt = Yes\r -Negotiate_TCP/IP = Yes\r -Disable_LCP = No\r -[TCP/IP]\r -Specify_IP_Address = No\r -Specity_Server_Address = No\r -IP_Header_Compress = Yes\r -Gateway_On_Remote = Yes\r -[User]\r -Name = { $username }\r -Password = { $password }\r -Display_Password = Yes\r -[Internet_Mail]\r -Email_Name = { $email_name }\r -Email_Address = { $username }\@domain.tld\r -POP_Server = mail.domain.tld\r -POP_Server_Port_Number = 110\r -POP_Login_Name = { $username }\r -POP_Login_Password = { $password }\r -SMTP_Server = mail.domain.tld\r -SMTP_Server_Port_Number = 25\r -Install_Mail = 1\r -[Internet_News]\r -NNTP_Server = news.domain.tld\r -NNTP_Server_Port_Number = 119\r -Logon_Required = No\r -Install_News = 1\r -[Branding]\r -Window_Title = The Internet\r +[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 |