diff options
-rwxr-xr-x | htdocs/view/cust_bill.cgi | 42 | ||||
-rwxr-xr-x | htdocs/view/cust_main.cgi | 7 | ||||
-rwxr-xr-x | htdocs/view/cust_pkg.cgi | 29 | ||||
-rwxr-xr-x | htdocs/view/svc_acct.cgi | 41 | ||||
-rwxr-xr-x | htdocs/view/svc_acct_sm.cgi | 41 | ||||
-rwxr-xr-x | htdocs/view/svc_domain.cgi | 28 |
6 files changed, 82 insertions, 106 deletions
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi index 96101d004..e77f13d9b 100755 --- a/htdocs/view/cust_bill.cgi +++ b/htdocs/view/cust_bill.cgi @@ -1,7 +1,6 @@ #!/usr/bin/perl -Tw # -# Usage: cust_bill.cgi invnum -# http://server.name/path/cust_bill.cgi?invnum +# $Id: cust_bill.cgi,v 1.2 1998-12-17 09:57:20 ivan Exp $ # # Note: Should be run setuid freeside as user nobody. # @@ -24,21 +23,26 @@ # bmccane@maxbaud.net 98-apr-3 # # also print 'printed' field ivan@sisd.com 98-jul-10 +# +# $Log: cust_bill.cgi,v $ +# Revision 1.2 1998-12-17 09:57:20 ivan +# s/CGI::(Base|Request)/CGI.pm/; +# use strict; use IO::File; -use CGI::Base qw(:DEFAULT :CGI); # CGI module +use CGI; use CGI::Carp qw(fatalsToBrowser); use FS::UID qw(cgisuidsetup); +use FS::CGI qw(header popurl); use FS::Record qw(qsearchs); -use FS::Invoice; +use FS::cust_bill; -my($cgi) = new CGI::Base; -$cgi->get; +my($cgi) = new CGI; &cgisuidsetup($cgi); #untaint invnum -$QUERY_STRING =~ /^(\d+)$/; +$cgi->query_string =~ /^(\d+)$/; my($invnum)=$1; my($cust_bill) = qsearchs('cust_bill',{'invnum'=>$invnum}); @@ -47,27 +51,17 @@ my($custnum) = $cust_bill->getfield('custnum'); my($printed) = $cust_bill->printed; -SendHeaders(); # one guess. -print <<END; -<HTML> - <HEAD> - <TITLE>Invoice View</TITLE> - </HEAD> - <BODY> - <CENTER> - <H1>Invoice View</H1> - <A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | <A HREF="../">Main menu</A> - </CENTER><HR> - <BASEFONT SIZE=3> - <CENTER> - <A HREF="../edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> - <BR><A HREF="../misc/print-invoice.cgi?$invnum">Reprint this invoice</A> +my $p = popurl(2); +print $cgi->header, header('Invoice View', menubar( + "Main Menu" => $p, + "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", +)), <<END; + <A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> + <BR><A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A> <BR><BR>(Printed $printed times) - </CENTER> <FONT SIZE=-1><PRE> END -bless($cust_bill,"FS::Invoice"); print $cust_bill->print_text; #formatting diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi index c39643d70..b1c0bbb01 100755 --- a/htdocs/view/cust_main.cgi +++ b/htdocs/view/cust_main.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# cust_main.cgi: View a customer +# $Id: cust_main.cgi,v 1.4 1998-12-17 09:57:21 ivan Exp $ # # Usage: cust_main.cgi custnum # http://server.name/path/cust_main.cgi?custnum @@ -33,7 +33,10 @@ # lose background, FS::CGI ivan@sisd.com 98-sep-2 # # $Log: cust_main.cgi,v $ -# Revision 1.3 1998-11-15 13:14:20 ivan +# Revision 1.4 1998-12-17 09:57:21 ivan +# s/CGI::(Base|Request)/CGI.pm/; +# +# Revision 1.3 1998/11/15 13:14:20 ivan # first pass as per-customer custom pricing # # Revision 1.2 1998/11/13 11:28:08 ivan diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi index d7269281f..bbe3db53d 100755 --- a/htdocs/view/cust_pkg.cgi +++ b/htdocs/view/cust_pkg.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# cust_pkg.cgi: View a package +# $Id: cust_pkg.cgi,v 1.3 1998-12-17 09:57:22 ivan Exp $ # # Usage: cust_pkg.cgi pkgnum # http://server.name/path/cust_pkg.cgi?pkgnum @@ -26,7 +26,10 @@ # no FS::Search ivan@sisd.com 98-mar-7 # # $Log: cust_pkg.cgi,v $ -# Revision 1.2 1998-11-13 09:56:49 ivan +# Revision 1.3 1998-12-17 09:57:22 ivan +# s/CGI::(Base|Request)/CGI.pm/; +# +# Revision 1.2 1998/11/13 09:56:49 ivan # change configuration file layout to support multiple distinct databases (with # own set of config files, export, etc.) # @@ -36,7 +39,7 @@ use Date::Format; use CGI; use CGI::Carp qw(fatalsToBrowser); use FS::UID qw(cgisuidsetup); -use FS::CGI qw(url); +use FS::CGI qw(popurl header); use FS::Record qw(qsearch qsearchs); my($cgi) = new CGI; @@ -45,25 +48,13 @@ cgisuidsetup($cgi); my(%uiview,%uiadd); my($part_svc); foreach $part_svc ( qsearch('part_svc',{}) ) { - $uiview{$part_svc->svcpart} = url(1). "/view/". $part_svc->svcdb . ".cgi"; - $uiadd{$part_svc->svcpart}= url(1). "/edit/". $part_svc->svcdb . ".cgi"; + $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi"; + $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi"; } -SendHeaders(); # one guess. -print <<END; -<HTML> - <HEAD> - <TITLE>Package View</TITLE> - </HEAD> - <BODY> - <CENTER> - <H1>Package View</H1> - </CENTER> - <BASEFONT SIZE=3> -END +print $cgi->header, header('Package View', ''); -#untaint pkgnum -$QUERY_STRING =~ /^(\d+)$/; +$cgi->query_string =~ /^(\d+)$/; my($pkgnum)=$1; #get package record diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi index e48878c42..9fcc4c57c 100755 --- a/htdocs/view/svc_acct.cgi +++ b/htdocs/view/svc_acct.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: svc_acct.cgi,v 1.2 1998-12-16 05:24:29 ivan Exp $ +# $Id: svc_acct.cgi,v 1.3 1998-12-17 09:57:23 ivan Exp $ # # Usage: svc_acct.cgi svcnum # http://server.name/path/svc_acct.cgi?svcnum @@ -35,27 +35,29 @@ # displays arbitrary radius attributes ivan@sisd.com 98-aug-16 # # $Log: svc_acct.cgi,v $ -# Revision 1.2 1998-12-16 05:24:29 ivan +# Revision 1.3 1998-12-17 09:57:23 ivan +# s/CGI::(Base|Request)/CGI.pm/; +# +# Revision 1.2 1998/12/16 05:24:29 ivan # use FS::Conf; # use strict; use vars qw($conf); -use CGI::Base qw(:DEFAULT :CGI); +use CGI; use CGI::Carp qw(fatalsToBrowser); use FS::UID qw(cgisuidsetup); use FS::Record qw(qsearchs fields); use FS::Conf; +my($cgi) = new CGI; +&cgisuidsetup($cgi); + $conf = new FS::Conf; my $mydomain = $conf->config('domain'); -my($cgi) = new CGI::Base; -$cgi->get; -&cgisuidsetup($cgi); - #untaint svcnum -$QUERY_STRING =~ /^(\d+)$/; +$cgi->query_string =~ /^(\d+)$/; my($svcnum)=$1; my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svcnum}); die "Unkonwn svcnum" unless $svc_acct; @@ -71,35 +73,26 @@ if ($pkgnum) { my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); die "Unkonwn svcpart" unless $part_svc; -SendHeaders(); # one guess. -print <<END; -<HTML> - <HEAD> - <TITLE>Account View</TITLE> - </HEAD> - <BODY> - <CENTER><H1>Account View</H1> - <BASEFONT SIZE=3> -<CENTER> -END +print $cgi->header, header('Account View', ''); +my $p = popurl(2); if ($pkgnum || $custnum) { print <<END; -<A HREF="../view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | -<A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | +<A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | +<A HREF="${p}view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | END } else { print <<END; -<A HREF="../misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> | +<A HREF="${p}misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> | END } print <<END; -<A HREF="../">Main menu</A></CENTER><BR> +<A HREF="${p}">Main menu</A></CENTER><BR> <FONT SIZE=+1>Service #$svcnum</FONT> END -print qq!<BR><A HREF="../edit/svc_acct.cgi?$svcnum">Edit this information</A>!; +print qq!<BR><A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A>!; #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!; print qq!<BR><BR><A HREF="#general">General</A> | <A HREF="#shell">Shell account</A> | !; print qq!<A HREF="#slip">SLIP/PPP account</A></CENTER>!; diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi index 00aa5551a..a80e36845 100755 --- a/htdocs/view/svc_acct_sm.cgi +++ b/htdocs/view/svc_acct_sm.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: svc_acct_sm.cgi,v 1.2 1998-12-16 05:24:30 ivan Exp $ +# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 09:57:24 ivan Exp $ # # Usage: svc_acct_sm.cgi svcnum # http://server.name/path/svc_acct_sm.cgi?svcnum @@ -22,26 +22,29 @@ # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17 # # $Log: svc_acct_sm.cgi,v $ -# Revision 1.2 1998-12-16 05:24:30 ivan +# Revision 1.3 1998-12-17 09:57:24 ivan +# s/CGI::(Base|Request)/CGI.pm/; +# +# Revision 1.2 1998/12/16 05:24:30 ivan # use FS::Conf; # use strict; use vars qw($conf); -use CGI::Base qw(:DEFAULT :CGI); +use CGI; use FS::UID qw(cgisuidsetup); +use FS::CGI qw(header popurl); use FS::Record qw(qsearchs); use FS::Conf; +my($cgi) = new CGI; +cgisuidsetup($cgi); + $conf = new FS::Conf; my $mydomain = $conf->config('domain'); -my($cgi) = new CGI::Base; -$cgi->get; -cgisuidsetup($cgi); - #untaint svcnum -$QUERY_STRING =~ /^(\d+)$/; +$cgi->query_string =~ /^(\d+)$/; my($svcnum)=$1; my($svc_acct_sm)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}); die "Unknown svcnum" unless $svc_acct_sm; @@ -57,30 +60,24 @@ if ($pkgnum) { my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); die "Unkonwn svcpart" unless $part_svc; -SendHeaders(); # one guess. -print <<END; -<HTML> - <HEAD> - <TITLE>Mail Alias View</TITLE> - </HEAD> - <BODY> - <CENTER><H1>Mail Alias View</H1> -END +print $cgi->header, header('Mail Alias View'); + +my $p = popurl(2); if ($pkgnum || $custnum) { print <<END; -<A HREF="../view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | -<A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | +<A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | +<A HREF="${p}view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | END } else { print <<END; -<A HREF="../misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> | +<A HREF="${p}misc/cancel-unaudited.cgi?$svcnum">Cancel this (unaudited)account</A> | END } print <<END; - <A HREF="../">Main menu</A></CENTER><BR< + <A HREF="${p}">Main menu</A></CENTER><BR< <FONT SIZE=+1>Service #$svcnum</FONT> - <P><A HREF="../edit/svc_acct_sm.cgi?$svcnum">Edit this information</A> + <P><A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A> <BASEFONT SIZE=3> END diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi index fa35a8cd5..a903fa4ba 100755 --- a/htdocs/view/svc_domain.cgi +++ b/htdocs/view/svc_domain.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# View svc_domain records +# $Id: svc_domain.cgi,v 1.3 1998-12-17 09:57:25 ivan Exp $ # # Usage: svc_domain svcnum # http://server.name/path/svc_domain.cgi?svcnum @@ -15,7 +15,10 @@ # bmccane@maxbaud.net 98-apr-3 # # $Log: svc_domain.cgi,v $ -# Revision 1.2 1998-11-13 09:56:50 ivan +# Revision 1.3 1998-12-17 09:57:25 ivan +# s/CGI::(Base|Request)/CGI.pm/; +# +# Revision 1.2 1998/11/13 09:56:50 ivan # change configuration file layout to support multiple distinct databases (with # own set of config files, export, etc.) # @@ -23,6 +26,7 @@ use strict; use CGI; use FS::UID qw(cgisuidsetup); +use FS::CGI qw(header menubar popurl); use FS::Record qw(qsearchs); my($cgi) = new CGI; @@ -46,19 +50,13 @@ if ($pkgnum) { my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); die "Unkonwn svcpart" unless $part_svc; -print $cgi->header, <<END; -<HTML> - <HEAD> - <TITLE>Domain View</TITLE> - </HEAD> - <BODY> - <CENTER><H1>Domain View</H1> - <BASEFONT SIZE=3> -<CENTER> -<A HREF="../view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> | -<A HREF="../view/cust_main.cgi?$custnum">View this customer (#$custnum)</A> | -<A HREF="../">Main menu</A></CENTER><BR> - <FONT SIZE=+1>Service #$svcnum</FONT> +my $p = popurl(2); +print $cgi->header, header('Domain View', menubar( + "Main menu" => $p, + "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", + "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", +)), <<END; + <BR><FONT SIZE=+1>Service #$svcnum</FONT> </CENTER> END |