summaryrefslogtreecommitdiff
path: root/htdocs/view
diff options
context:
space:
mode:
Diffstat (limited to 'htdocs/view')
-rwxr-xr-xhtdocs/view/cust_bill.cgi23
-rwxr-xr-xhtdocs/view/cust_main.cgi39
-rwxr-xr-xhtdocs/view/cust_pkg.cgi33
-rwxr-xr-xhtdocs/view/svc_acct.cgi32
-rwxr-xr-xhtdocs/view/svc_acct_sm.cgi43
-rwxr-xr-xhtdocs/view/svc_domain.cgi29
6 files changed, 112 insertions, 87 deletions
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index ccfc33c81..44e3a4a1b 100755
--- a/htdocs/view/cust_bill.cgi
+++ b/htdocs/view/cust_bill.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: cust_bill.cgi,v 1.5 1999-01-18 09:41:42 ivan Exp $
+# $Id: cust_bill.cgi,v 1.6 1999-01-19 05:14:18 ivan Exp $
#
# Note: Should be run setuid freeside as user nobody.
#
@@ -25,7 +25,11 @@
# also print 'printed' field ivan@sisd.com 98-jul-10
#
# $Log: cust_bill.cgi,v $
-# Revision 1.5 1999-01-18 09:41:42 ivan
+# Revision 1.6 1999-01-19 05:14:18 ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5 1999/01/18 09:41:42 ivan
# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
# (good idea anyway)
#
@@ -40,6 +44,7 @@
#
use strict;
+use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
use IO::File;
use CGI;
use CGI::Carp qw(fatalsToBrowser);
@@ -48,21 +53,21 @@ use FS::CGI qw(header popurl menubar);
use FS::Record qw(qsearchs);
use FS::cust_bill;
-my($cgi) = new CGI;
+$cgi = new CGI;
&cgisuidsetup($cgi);
#untaint invnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
-my($invnum)=$1;
+$invnum = $1;
-my($cust_bill) = qsearchs('cust_bill',{'invnum'=>$invnum});
+$cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
die "Invoice #$invnum not found!" unless $cust_bill;
-my($custnum) = $cust_bill->getfield('custnum');
+$custnum = $cust_bill->getfield('custnum');
-my($printed) = $cust_bill->printed;
+$printed = $cust_bill->printed;
-my $p = popurl(2);
+$p = popurl(2);
print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
"Main Menu" => $p,
"View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi
index 71a4e517e..7c5f4bead 100755
--- a/htdocs/view/cust_main.cgi
+++ b/htdocs/view/cust_main.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: cust_main.cgi,v 1.9 1999-01-18 09:41:43 ivan Exp $
+# $Id: cust_main.cgi,v 1.10 1999-01-19 05:14:19 ivan Exp $
#
# Usage: cust_main.cgi custnum
# http://server.name/path/cust_main.cgi?custnum
@@ -33,7 +33,11 @@
# lose background, FS::CGI ivan@sisd.com 98-sep-2
#
# $Log: cust_main.cgi,v $
-# Revision 1.9 1999-01-18 09:41:43 ivan
+# Revision 1.10 1999-01-19 05:14:19 ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.9 1999/01/18 09:41:43 ivan
# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
# (good idea anyway)
#
@@ -60,6 +64,9 @@
#
use strict;
+use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral
+ @packages $package @history @bills $bill @credits $credit
+ $balance $item );
use CGI;
use CGI::Carp qw(fatalsToBrowser);
use Date::Format;
@@ -76,7 +83,7 @@ use FS::agent;
use FS::cust_main;
use FS::cust_refund;
-my($cgi) = new CGI;
+$cgi = new CGI;
&cgisuidsetup($cgi);
print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
@@ -86,12 +93,12 @@ print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
END
die "No customer specified (bad URL)!" unless $cgi->keywords;
-my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
+($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
$query =~ /^(\d+)$/;
-my($custnum)=$1;
-my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
+$custnum = $1;
+$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
die "Customer not found!" unless $cust_main;
-my($hashref)=$cust_main->hashref;
+$hashref = $cust_main->hashref;
#custnum
print "<FONT SIZE=+1><CENTER>Customer #<B>$custnum</B></CENTER></FONT>",
@@ -111,7 +118,7 @@ print qq!<HR><A NAME="cust_main"><CENTER><FONT SIZE=+1>Customer Information!,
qq!">Edit this information</A></CENTER><FONT SIZE=-1>!;
#agentnum
-my($agent)=qsearchs('agent',{
+$agent = qsearchs('agent',{
'agentnum' => $cust_main->getfield('agentnum')
} );
die "Agent not found!" unless $agent;
@@ -119,7 +126,7 @@ print "<BR>Agent #<B>" , $agent->getfield('agentnum') , ": " ,
$agent->getfield('agent') , "</B>";
#refnum
-my($referral)=qsearchs('part_referral',{'refnum' => $cust_main->refnum});
+$referral = qsearchs('part_referral',{'refnum' => $cust_main->refnum});
die "Referral not found!" unless $referral;
print "<BR>Referral #<B>", $referral->refnum, ": ",
$referral->referral, "<\B>";
@@ -215,8 +222,7 @@ print qq!<CENTER>!, table, "\n",
qq!</TR>\n!;
#get package info
-my(@packages)=qsearch('cust_pkg',{'custnum'=>$custnum});
-my($package);
+@packages = qsearch('cust_pkg',{'custnum'=>$custnum});
foreach $package (@packages) {
my($pref)=$package->hashref;
my($part_pkg)=qsearchs('part_pkg',{
@@ -265,10 +271,7 @@ print qq!<CENTER><HR><A NAME="history"><FONT SIZE=+1>Payment History!,
# major problem: this whole thing is way too sloppy.
# minor problem: the description lines need better formatting.
-my(@history);
-
-my(@bills)=qsearch('cust_bill',{'custnum'=>$custnum});
-my($bill);
+@bills = qsearch('cust_bill',{'custnum'=>$custnum});
foreach $bill (@bills) {
my($bref)=$bill->hashref;
push @history,
@@ -292,8 +295,7 @@ foreach $bill (@bills) {
}
}
-my(@credits)=qsearch('cust_credit',{'custnum'=>$custnum});
-my($credit);
+@credits = qsearch('cust_credit',{'custnum'=>$custnum});
foreach $credit (@credits) {
my($cref)=$credit->hashref;
push @history,
@@ -328,8 +330,7 @@ END
#display payment history
-my($balance)=0;
-my($item);
+$balance = 0;
foreach $item (sort keyfield_numerically @history) {
my($date,$desc,$charge,$payment,$credit,$refund)=split(/\t/,$item);
$charge ||= 0;
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index 3f6eed614..f1b7b9473 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: cust_pkg.cgi,v 1.6 1999-01-18 09:41:44 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.7 1999-01-19 05:14:20 ivan Exp $
#
# Usage: cust_pkg.cgi pkgnum
# http://server.name/path/cust_pkg.cgi?pkgnum
@@ -26,7 +26,11 @@
# no FS::Search ivan@sisd.com 98-mar-7
#
# $Log: cust_pkg.cgi,v $
-# Revision 1.6 1999-01-18 09:41:44 ivan
+# Revision 1.7 1999-01-19 05:14:20 ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6 1999/01/18 09:41:44 ivan
# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
# (good idea anyway)
#
@@ -42,6 +46,9 @@
#
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);
@@ -54,11 +61,9 @@ use FS::part_pkg;
use FS::pkg_svc;
use FS::cust_svc;
-my($cgi) = new CGI;
+$cgi = new CGI;
cgisuidsetup($cgi);
-my(%uiview,%uiadd);
-my($part_svc);
foreach $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";
@@ -66,22 +71,22 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
print $cgi->header( '-expires' => 'now' ), header('Package View', '');
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
-my($pkgnum)=$1;
+$pkgnum = $1;
#get package record
-my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
die "No package!" unless $cust_pkg;
-my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
+$part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
#nav bar
-my($custnum)=$cust_pkg->getfield('custnum');
+$custnum = $cust_pkg->getfield('custnum');
print qq!<CENTER><A HREF="../view/cust_main.cgi?$custnum">View this customer!,
qq! (#$custnum)</A> | <A HREF="../">Main menu</A></CENTER><BR>!;
#print info
-my($susp,$cancel,$expire)=(
+($susp,$cancel,$expire)=(
$cust_pkg->getfield('susp'),
$cust_pkg->getfield('cancel'),
$cust_pkg->getfield('expire'),
@@ -91,13 +96,13 @@ print qq!<BR><A HREF="#package">Package Information</A>!;
print qq! | <A HREF="#services">Service Information</A>! unless $cancel;
print qq!</CENTER><HR>\n!;
-my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
+($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
print qq!<A NAME="package"><CENTER><FONT SIZE=+1>Package Information!,
qq!</FONT></A>!;
print qq!<BR><A HREF="../unimp.html">Edit this information</A></CENTER>!;
print "<P>Package: <B>$pkg - $comment</B>";
-my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
+($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
print "<BR>Setup: <B>", $setup ? time2str("%D",$setup) : "(Not setup)" ,"</B>";
print "<BR>Next bill: <B>", $bill ? time2str("%D",$bill) : "" ,"</B>";
@@ -125,7 +130,7 @@ if ($cancel) {
}
#otaker
-my($otaker)=$cust_pkg->getfield('otaker');
+$otaker = $cust_pkg->getfield('otaker');
print "<P>Order taken by <B>$otaker</B>";
unless ($cancel) {
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 1151e1ced..a5b4f4858 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.6 1999-01-18 09:41:45 ivan Exp $
+# $Id: svc_acct.cgi,v 1.7 1999-01-19 05:14:21 ivan Exp $
#
# Usage: svc_acct.cgi svcnum
# http://server.name/path/svc_acct.cgi?svcnum
@@ -35,7 +35,11 @@
# displays arbitrary radius attributes ivan@sisd.com 98-aug-16
#
# $Log: svc_acct.cgi,v $
-# Revision 1.6 1999-01-18 09:41:45 ivan
+# Revision 1.7 1999-01-19 05:14:21 ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6 1999/01/18 09:41:45 ivan
# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
# (good idea anyway)
#
@@ -53,7 +57,8 @@
#
use strict;
-use vars qw( $conf );
+use vars qw( $conf $cgi $mydomain $query $svcnum $svc_acct $cust_svc $pkgnum
+ $cust_pkg $custnum $part_svc $p $svc_acct_pop );
use CGI;
use CGI::Carp qw( fatalsToBrowser );
use FS::UID qw( cgisuidsetup );
@@ -66,33 +71,32 @@ use FS::cust_pkg;
use FS::part_svc;
use FS::svc_acct_pop;
-my($cgi) = new CGI;
+$cgi = new CGI;
&cgisuidsetup($cgi);
$conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
+$mydomain = $conf->config('domain');
#untaint svcnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
-my($svcnum)=$1;
-my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svcnum});
+$svcnum = $1;
+$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
die "Unkonwn svcnum" unless $svc_acct;
-my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my($pkgnum)=$cust_svc->getfield('pkgnum');
-my($cust_pkg,$custnum);
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
if ($pkgnum) {
$cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
$custnum=$cust_pkg->getfield('custnum');
}
-my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
die "Unkonwn svcpart" unless $part_svc;
print $cgi->header( '-expires' => 'now' ), header('Account View', '');
-my $p = popurl(2);
+$p = popurl(2);
if ($pkgnum || $custnum) {
print <<END;
<A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> |
@@ -131,7 +135,7 @@ if (substr($svc_acct->_password,0,1) eq "*") {
}
# popnum -> svc_acct_pop record
-my($svc_acct_pop)=qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+$svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
#pop
print "POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index ab8450fce..80bd48967 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.5 1999-01-18 09:41:46 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.6 1999-01-19 05:14:22 ivan Exp $
#
# Usage: svc_acct_sm.cgi svcnum
# http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -22,7 +22,11 @@
# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
#
# $Log: svc_acct_sm.cgi,v $
-# Revision 1.5 1999-01-18 09:41:46 ivan
+# Revision 1.6 1999-01-19 05:14:22 ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5 1999/01/18 09:41:46 ivan
# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
# (good idea anyway)
#
@@ -37,40 +41,41 @@
#
use strict;
-use vars qw($conf);
+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);
use FS::Record qw(qsearchs);
use FS::Conf;
-my($cgi) = new CGI;
+$cgi = new CGI;
cgisuidsetup($cgi);
$conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
+$mydomain = $conf->config('domain');
#untaint svcnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
-my($svcnum)=$1;
-my($svc_acct_sm)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
+$svcnum = $1;
+$svc_acct_sm = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
die "Unknown svcnum" unless $svc_acct_sm;
-my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my($pkgnum)=$cust_svc->getfield('pkgnum');
-my($cust_pkg,$custnum);
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
if ($pkgnum) {
$cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
$custnum=$cust_pkg->getfield('custnum');
}
-my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
die "Unkonwn svcpart" unless $part_svc;
print $cgi->header( '-expires' => 'now' ), header('Mail Alias View');
-my $p = popurl(2);
+$p = popurl(2);
if ($pkgnum || $custnum) {
print <<END;
<A HREF="${p}view/cust_pkg.cgi?$pkgnum">View this package (#$pkgnum)</A> |
@@ -89,16 +94,16 @@ print <<END;
<BASEFONT SIZE=3>
END
-my($domsvc,$domuid,$domuser)=(
+($domsvc,$domuid,$domuser) = (
$svc_acct_sm->domsvc,
$svc_acct_sm->domuid,
$svc_acct_sm->domuser,
);
-my($svc) = $part_svc->svc;
-my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$domsvc});
-my($domain)=$svc_domain->domain;
-my($svc_acct)=qsearchs('svc_acct',{'uid'=>$domuid});
-my($username)=$svc_acct->username;
+$svc = $part_svc->svc;
+$svc_domain = qsearchs('svc_domain',{'svcnum'=>$domsvc});
+$domain = $svc_domain->domain;
+$svc_acct = qsearchs('svc_acct',{'uid'=>$domuid});
+$username = $svc_acct->username;
#formatting
print qq!<HR>!;
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index 7fa65e020..a6de40429 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: svc_domain.cgi,v 1.5 1999-01-18 09:41:47 ivan Exp $
+# $Id: svc_domain.cgi,v 1.6 1999-01-19 05:14:23 ivan Exp $
#
# Usage: svc_domain svcnum
# http://server.name/path/svc_domain.cgi?svcnum
@@ -15,7 +15,11 @@
# bmccane@maxbaud.net 98-apr-3
#
# $Log: svc_domain.cgi,v $
-# Revision 1.5 1999-01-18 09:41:47 ivan
+# Revision 1.6 1999-01-19 05:14:23 ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5 1999/01/18 09:41:47 ivan
# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
# (good idea anyway)
#
@@ -31,34 +35,35 @@
#
use strict;
+use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum
+ $cust_pkg $custnum $part_svc $p );
use CGI;
use FS::UID qw(cgisuidsetup);
use FS::CGI qw(header menubar popurl);
use FS::Record qw(qsearchs);
-my($cgi) = new CGI;
+$cgi = new CGI;
cgisuidsetup($cgi);
#untaint svcnum
-my($query) = $cgi->keywords;
+($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
-my($svcnum)=$1;
-my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svcnum});
+$svcnum = $1;
+$svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
die "Unknown svcnum" unless $svc_domain;
-my($domain)=$svc_domain->domain;
+$domain = $svc_domain->domain;
-my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my($pkgnum)=$cust_svc->getfield('pkgnum');
-my($cust_pkg,$custnum);
+$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+$pkgnum = $cust_svc->getfield('pkgnum');
if ($pkgnum) {
$cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
$custnum=$cust_pkg->getfield('custnum');
}
-my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
die "Unkonwn svcpart" unless $part_svc;
-my $p = popurl(2);
+$p = popurl(2);
print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
"Main menu" => $p,
"View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",