diff options
Diffstat (limited to 'httemplate/view')
| -rwxr-xr-x | httemplate/view/cust_bill.cgi | 26 | ||||
| -rwxr-xr-x | httemplate/view/cust_main.cgi | 65 | ||||
| -rwxr-xr-x | httemplate/view/cust_pkg.cgi | 45 | ||||
| -rwxr-xr-x | httemplate/view/svc_acct.cgi | 48 | ||||
| -rwxr-xr-x | httemplate/view/svc_acct_sm.cgi | 51 | ||||
| -rwxr-xr-x | httemplate/view/svc_domain.cgi | 36 | ||||
| -rwxr-xr-x | httemplate/view/svc_forward.cgi | 47 | ||||
| -rw-r--r-- | httemplate/view/svc_www.cgi | 33 |
8 files changed, 105 insertions, 246 deletions
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index bbcf87fc2..ef6d56611 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -1,31 +1,17 @@ +<!-- $Id: cust_bill.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ --> <% -# <!-- $Id: cust_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ --> - -use strict; -use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p ); -use IO::File; -use CGI; -use CGI::Carp qw(fatalsToBrowser); -use FS::UID qw(cgisuidsetup); -use FS::CGI qw(header popurl menubar); -use FS::Record qw(qsearchs); -use FS::cust_bill; - -$cgi = new CGI; -&cgisuidsetup($cgi); #untaint invnum -($query) = $cgi->keywords; +my($query) = $cgi->keywords; $query =~ /^(\d+)$/; -$invnum = $1; +my $invnum = $1; -$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum}); +my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum}); die "Invoice #$invnum not found!" unless $cust_bill; -$custnum = $cust_bill->getfield('custnum'); +my $custnum = $cust_bill->getfield('custnum'); -$printed = $cust_bill->printed; +my $printed = $cust_bill->printed; -$p = popurl(2); print header('Invoice View', menubar( "Main Menu" => $p, "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 8710dd19d..9595a07e1 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -1,45 +1,18 @@ +<!-- $Id: cust_main.cgi,v 1.19 2002-01-30 14:18:09 ivan Exp $ --> <% -#<!-- $Id: cust_main.cgi,v 1.18 2001-12-27 09:26:14 ivan Exp $ --> - -use strict; -use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral - @packages $package @history @bills $bill @credits $credit - $balance $item @agents @referrals @invoicing_list $n1 $conf - $signupurl ); -use CGI; -use CGI::Carp qw(fatalsToBrowser); -use Date::Format; -use FS::UID qw(cgisuidsetup); -use FS::Record qw(qsearchs qsearch); -use FS::CGI qw(header menubar popurl table itable ntable); -use FS::cust_credit; -use FS::cust_pay; -use FS::cust_bill; -use FS::part_pkg; -use FS::cust_pkg; -use FS::part_referral; -use FS::agent; -use FS::cust_main; -use FS::cust_refund; -use FS::cust_bill_pay; -use FS::cust_credit_bill; - -$cgi = new CGI; -&cgisuidsetup($cgi); - -$conf = new FS::Conf; + +my $conf = new FS::Conf; print header("Customer View", menubar( 'Main Menu' => popurl(2) )); die "No customer specified (bad URL)!" unless $cgi->keywords; -($query) = $cgi->keywords; # needs parens with my, ->keywords returns array +my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array $query =~ /^(\d+)$/; -$custnum = $1; -$cust_main = qsearchs('cust_main',{'custnum'=>$custnum}); +my $custnum = $1; +my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum}); die "Customer not found!" unless $cust_main; -$hashref = $cust_main->hashref; print qq!<A HREF="!, popurl(2), qq!edit/cust_main.cgi?$custnum">Edit this customer</A>!; @@ -159,7 +132,8 @@ print '<TD VALIGN="top">'; $custnum, '</TD></TR>', ; - @agents = qsearch( 'agent', {} ); + my @agents = qsearch( 'agent', {} ); + my $agent; unless ( scalar(@agents) == 1 ) { $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } ); print '<TR><TD ALIGN="right">Agent</TD><TD BGCOLOR="#ffffff">', @@ -167,7 +141,7 @@ print '<TD VALIGN="top">'; } else { $agent = $agents[0]; } - @referrals = qsearch( 'part_referral', {} ); + my @referrals = qsearch( 'part_referral', {} ); unless ( scalar(@referrals) == 1 ) { my $referral = qsearchs('part_referral', { 'refnum' => $cust_main->refnum @@ -202,7 +176,7 @@ print '<TD VALIGN="top">'; print '<BR>'; - @invoicing_list = $cust_main->invoicing_list; + my @invoicing_list = $cust_main->invoicing_list; print "Billing information (", qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)", &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2), @@ -298,14 +272,15 @@ print qq!!, &table(), "\n", qq!</TR>\n!; #get package info +my @packages; if ( $conf->exists('hidecancelledpackages') ) { @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->ncancelled_pkgs); } else { @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs); } -$n1 = '<TR>'; -foreach $package (@packages) { +my $n1 = '<TR>'; +foreach my $package (@packages) { my $pkgnum = $package->pkgnum; my $pkg = $package->part_pkg->pkg; my $comment = $package->part_pkg->comment; @@ -362,12 +337,12 @@ print qq!<BR><BR><A NAME="history">Payment History!. # major problem: this whole thing is way too sloppy. # minor problem: the description lines need better formatting. -@history = (); #needed for mod_perl :) +my @history = (); #needed for mod_perl :) my %target = (); -@bills = qsearch('cust_bill',{'custnum'=>$custnum}); -foreach $bill (@bills) { +my @bills = qsearch('cust_bill',{'custnum'=>$custnum}); +foreach my $bill (@bills) { my($bref)=$bill->hashref; my $bpre = ( $bill->owed > 0 ) ? '<b><font size="+1" color="#ff0000"> Open ' @@ -418,9 +393,9 @@ foreach $bill (@bills) { } } -@credits = grep { $_->credited > 0 } +my @credits = grep { $_->credited > 0 } qsearch('cust_credit',{'custnum'=>$custnum}); -foreach $credit (@credits) { +foreach my $credit (@credits) { my($cref)=$credit->hashref; push @history, $cref->{_date} . "\t" . @@ -478,8 +453,8 @@ END #display payment history -$balance = 0; -foreach $item (sort keyfield_numerically @history) { +my $balance = 0; +foreach my $item (sort keyfield_numerically @history) { my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item); $charge ||= 0; $payment ||= 0; diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi index c8b362cc3..0e6773713 100755 --- a/httemplate/view/cust_pkg.cgi +++ b/httemplate/view/cust_pkg.cgi @@ -1,54 +1,37 @@ +<!-- $Id: cust_pkg.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ --> <% -# <!-- $Id: cust_pkg.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ --> - -use strict; -use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg - $custnum $susp $cancel $expire $pkg $comment $setup $bill - $otaker ); -use Date::Format; -use CGI; -use CGI::Carp qw(fatalsToBrowser); -use FS::UID qw(cgisuidsetup); -use FS::CGI qw(popurl header menubar ntable table); -use FS::Record qw(qsearch qsearchs); -use FS::part_svc; -use FS::cust_pkg; -use FS::part_pkg; -use FS::pkg_svc; -use FS::cust_svc; - -$cgi = new CGI; -cgisuidsetup($cgi); - -foreach $part_svc ( qsearch('part_svc',{}) ) { + +my %uiview = (); +my %uiadd = (); +foreach my $part_svc ( qsearch('part_svc',{}) ) { $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi"; $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi"; } -($query) = $cgi->keywords; +my ($query) = $cgi->keywords; $query =~ /^(\d+)$/; -$pkgnum = $1; +my $pkgnum = $1; #get package record -$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); +my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); die "No package!" unless $cust_pkg; -$part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')}); +my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')}); -$custnum = $cust_pkg->getfield('custnum'); +my $custnum = $cust_pkg->getfield('custnum'); print header('Package View', menubar( "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum", 'Main Menu' => popurl(2) )); #print info -($susp,$cancel,$expire)=( +my ($susp,$cancel,$expire)=( $cust_pkg->getfield('susp'), $cust_pkg->getfield('cancel'), $cust_pkg->getfield('expire'), ); -($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment')); -($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill')); -$otaker = $cust_pkg->getfield('otaker'); +my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment')); +my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill')); +my $otaker = $cust_pkg->getfield('otaker'); print <<END; <SCRIPT> diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index 7cebdf8da..a4e377078 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -1,37 +1,19 @@ +<!-- $Id: svc_acct.cgi,v 1.10 2002-01-30 14:18:09 ivan Exp $ --> <% -# <!-- $Id: svc_acct.cgi,v 1.9 2001-12-15 22:59:35 ivan Exp $ --> -use strict; -use vars qw( $conf $cgi $domain $query $svcnum $svc_acct $cust_svc $pkgnum - $cust_pkg $custnum $part_svc $p $svc_acct_pop $password - $mydomain $svc_domain ); -use CGI; -use CGI::Carp qw( fatalsToBrowser ); -use FS::UID qw( cgisuidsetup ); -use FS::CGI qw( header popurl menubar ntable); -use FS::Record qw( qsearchs fields ); -use FS::Conf; -use FS::svc_acct; -use FS::cust_svc; -use FS::cust_pkg; -use FS::part_svc; -use FS::svc_acct_pop; -use FS::raddb; +my $conf = new FS::Conf; +my $mydomain = $conf->config('domain'); -$cgi = new CGI; -&cgisuidsetup($cgi); - -$conf = new FS::Conf; - -($query) = $cgi->keywords; +my($query) = $cgi->keywords; $query =~ /^(\d+)$/; -$svcnum = $1; -$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum}); +my $svcnum = $1; +my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum}); die "Unknown svcnum" unless $svc_acct; #false laziness w/all svc_*.cgi -$cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } ); -$pkgnum = $cust_svc->getfield('pkgnum'); +my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } ); +my $pkgnum = $cust_svc->getfield('pkgnum'); +my($cust_pkg, $custnum); if ($pkgnum) { $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } ); $custnum = $cust_pkg->custnum; @@ -41,22 +23,22 @@ if ($pkgnum) { } #eofalse -$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); +my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); die "Unknown svcpart" unless $part_svc; +my $domain; if ( $svc_acct->domsvc ) { - $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } ); + my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } ); die "Unknown domain" unless $svc_domain; $domain = $svc_domain->domain; } else { - unless ( $mydomain = $conf->config('domain') ) { + unless ( $mydomain ) { die "No legacy domain config file and no svc_domain.svcnum record ". "for svc_acct.domsvc: ". $cust_svc->domsvc; } $domain = $mydomain; } -$p = popurl(2); print header('Account View', menubar( ( ( $pkgnum || $custnum ) ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", @@ -84,7 +66,7 @@ print "<TR><TD ALIGN=\"right\">Domain</TD>". "<TD BGCOLOR=\"#ffffff\">". $domain, "</TD></TR>"; print "<TR><TD ALIGN=\"right\">Password</TD><TD BGCOLOR=\"#ffffff\">"; -$password = $svc_acct->_password; +my $password = $svc_acct->_password; if ( $password =~ /^\*\w+\* (.*)$/ ) { $password = $1; print "<I>(login disabled)</I> "; @@ -97,7 +79,7 @@ if ( $conf->exists('showpasswords') ) { print "</TR></TD>"; $password = ''; -$svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum}); +my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum}); print "<TR><TD ALIGN=\"right\">Access number</TD>". "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>' if $svc_acct_pop; diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi index 366ee99f9..c8561caba 100755 --- a/httemplate/view/svc_acct_sm.cgi +++ b/httemplate/view/svc_acct_sm.cgi @@ -1,36 +1,18 @@ +<!-- $Id: svc_acct_sm.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ --> <% -#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ --> -use strict; -use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc - $pkgnum $cust_pkg $custnum $part_svc $p $domsvc $domuid $domuser - $svc $svc_domain $domain $svc_acct $username ); -use CGI; -use FS::UID qw(cgisuidsetup); -use FS::CGI qw(header popurl menubar ); -use FS::Record qw(qsearchs); -use FS::Conf; -use FS::svc_acct_sm; -use FS::cust_svc; -use FS::cust_pkg; -use FS::part_svc; -use FS::svc_domain; -use FS::svc_acct; +my $conf = new FS::Conf; +my $mydomain = $conf->config('domain'); -$cgi = new CGI; -cgisuidsetup($cgi); - -$conf = new FS::Conf; -$mydomain = $conf->config('domain'); - -($query) = $cgi->keywords; +my($query) = $cgi->keywords; $query =~ /^(\d+)$/; -$svcnum = $1; -$svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}); +my $svcnum = $1; +my $svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}); die "Unknown svcnum" unless $svc_acct_sm; -$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum}); -$pkgnum = $cust_svc->getfield('pkgnum'); +my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum}); +my $pkgnum = $cust_svc->getfield('pkgnum'); +my($cust_pkg, $custnum); if ($pkgnum) { $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); $custnum=$cust_pkg->getfield('custnum'); @@ -39,10 +21,9 @@ if ($pkgnum) { $custnum = ''; } -$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ) +my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ) or die "Unkonwn svcpart"; -$p = popurl(2); print header('Mail Alias View', menubar( ( ( $pkgnum || $custnum ) ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", @@ -54,18 +35,18 @@ print header('Mail Alias View', menubar( "Main menu" => $p, )); -($domsvc,$domuid,$domuser) = ( +my($domsvc,$domuid,$domuser) = ( $svc_acct_sm->domsvc, $svc_acct_sm->domuid, $svc_acct_sm->domuser, ); -$svc = $part_svc->svc; -$svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc}) +my $svc = $part_svc->svc; +my $svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc}) or die "Corrupted database: no svc_domain.svcnum matching domsvc $domsvc"; -$domain = $svc_domain->domain; -$svc_acct = qsearchs('svc_acct',{'uid'=>$domuid}) +my $domain = $svc_domain->domain; +my $svc_acct = qsearchs('svc_acct',{'uid'=>$domuid}) or die "Corrupted database: no svc_acct.uid matching domuid $domuid"; -$username = $svc_acct->username; +my $username = $svc_acct->username; print qq!<A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A>!, "<BR>Service #$svcnum", diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi index 4add200b9..c980b1c25 100755 --- a/httemplate/view/svc_domain.cgi +++ b/httemplate/view/svc_domain.cgi @@ -1,29 +1,15 @@ +<!-- $Id: svc_domain.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ --> <% -# <!-- $Id: svc_domain.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ --> -use strict; -use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum - $cust_pkg $custnum $part_svc $p $svc_acct $email); -use CGI; -use FS::UID qw(cgisuidsetup); -use FS::CGI qw(header menubar popurl menubar); -use FS::Record qw(qsearchs); -use FS::svc_domain; -use FS::cust_svc; -use FS::cust_pkg; -use FS::part_svc; - -$cgi = new CGI; -cgisuidsetup($cgi); - -($query) = $cgi->keywords; +my($query) = $cgi->keywords; $query =~ /^(\d+)$/; -$svcnum = $1; -$svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum}); +my $svcnum = $1; +my $svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum}); die "Unknown svcnum" unless $svc_domain; -$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum}); -$pkgnum = $cust_svc->getfield('pkgnum'); +my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum}); +my $pkgnum = $cust_svc->getfield('pkgnum'); +my($cust_pkg, $custnum); if ($pkgnum) { $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); $custnum=$cust_pkg->getfield('custnum'); @@ -32,18 +18,18 @@ if ($pkgnum) { $custnum = ''; } -$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); +my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); die "Unknown svcpart" unless $part_svc; +my $email = ''; if ($svc_domain->catchall) { - $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } ); + my $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } ); die "Unknown svcpart" unless $svc_acct; $email = $svc_acct->email; } -$domain = $svc_domain->domain; +my $domain = $svc_domain->domain; -$p = popurl(2); print header('Domain View', menubar( ( ( $pkgnum || $custnum ) ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index bb9587062..fc465dbab 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -1,34 +1,17 @@ +<!-- $Id: svc_forward.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ --> <% -# <!-- $Id: svc_forward.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ --> -use strict; -use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc - $pkgnum $cust_pkg $custnum $part_svc $p $srcsvc $dstsvc $dst - $svc $svc_acct $source $destination); -use CGI; -use FS::UID qw(cgisuidsetup); -use FS::CGI qw(header popurl menubar ); -use FS::Record qw(qsearchs); -use FS::Conf; -use FS::cust_svc; -use FS::cust_pkg; -use FS::part_svc; -use FS::svc_acct; -use FS::svc_forward; +my $conf = new FS::Conf; -$cgi = new CGI; -cgisuidsetup($cgi); - -$conf = new FS::Conf; - -($query) = $cgi->keywords; +my($query) = $cgi->keywords; $query =~ /^(\d+)$/; -$svcnum = $1; -$svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum}); +my $svcnum = $1; +my $svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum}); die "Unknown svcnum" unless $svc_forward; -$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum}); -$pkgnum = $cust_svc->getfield('pkgnum'); +my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum}); +my $pkgnum = $cust_svc->getfield('pkgnum'); +my($cust_pkg, $custnum); if ($pkgnum) { $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); $custnum=$cust_pkg->getfield('custnum'); @@ -37,10 +20,9 @@ if ($pkgnum) { $custnum = ''; } -$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ) +my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ) or die "Unkonwn svcpart"; -$p = popurl(2); print header('Mail Forward View', menubar( ( ( $pkgnum || $custnum ) ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", @@ -52,17 +34,18 @@ print header('Mail Forward View', menubar( "Main menu" => $p, )); -($srcsvc,$dstsvc,$dst) = ( +my($srcsvc,$dstsvc,$dst) = ( $svc_forward->srcsvc, $svc_forward->dstsvc, $svc_forward->dst, ); -$svc = $part_svc->svc; -$svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc}) +my $svc = $part_svc->svc; +my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc}) or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc"; -$source = $svc_acct->email; +my $source = $svc_acct->email; +my $destination; if ($dstsvc) { - $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc}) + my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc}) or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc"; $destination = $svc_acct->email; }else{ diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi index ff9d57b5f..bc605be24 100644 --- a/httemplate/view/svc_www.cgi +++ b/httemplate/view/svc_www.cgi @@ -1,32 +1,16 @@ +<!-- $Id: svc_www.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ --> <% -# <!-- $Id: svc_www.cgi,v 1.1 2001-12-15 22:56:07 ivan Exp $ --> -use strict; -use vars qw( $cgi $query $svcnum $svc_www $cust_svc $pkgnum - $cust_pkg $custnum $p $domain_record ); - #$part_svc $p $svc_acct $email -use CGI; -use FS::UID qw(cgisuidsetup); -use FS::CGI qw(header menubar popurl menubar); -use FS::Record qw(qsearchs); -use FS::svc_www; -use FS::domain_record; -use FS::cust_svc; -#use FS::cust_pkg; -#use FS::part_svc; - -$cgi = new CGI; -cgisuidsetup($cgi); - -($query) = $cgi->keywords; +my($query) = $cgi->keywords; $query =~ /^(\d+)$/; -$svcnum = $1; -$svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } ) +my $svcnum = $1; +my $svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } ) or die "svc_www: Unknown svcnum $svcnum"; #false laziness w/all svc_*.cgi -$cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } ); -$pkgnum = $cust_svc->getfield('pkgnum'); +my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } ); +my $pkgnum = $cust_svc->getfield('pkgnum'); +my($cust_pkg, custnum); if ($pkgnum) { $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } ); $custnum = $cust_pkg->custnum; @@ -36,12 +20,11 @@ if ($pkgnum) { } #eofalse -$domain_record = qsearchs( 'domain_record', { 'recnum' => $svc_www->recnum } ) +my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } ) or die "svc_www: Unknown recnum". $svc_www->recnum; my $www = $domain_record->reczone; -$p = popurl(2); print header('Website View', menubar( ( ( $custnum ) ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", |