$cgi->keywords instead of $cgi->query_string

18 files changed, 130 insertions, 56 deletions

diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index 9695d9398..4d41d0b32 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.3 1998-12-17 06:17:10 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.4 1998-12-23 02:57:45 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.3  1998-12-17 06:17:10  ivan
+# Revision 1.4  1998-12-23 02:57:45  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:10  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/11/13 09:56:47  ivan
@@ -31,7 +34,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 my($svc_acct_pop,$action);
-if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
+my($query)=$cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
   $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
   $action='Edit';
 } else { #adding
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index 3f96efc4e..7a1b946e0 100755
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 06:17:11 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.4 1998-12-23 02:58:45 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -35,7 +35,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.3  1998-12-17 06:17:11  ivan
+# Revision 1.4  1998-12-23 02:58:45  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:11  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/12/16 05:19:15  ivan
@@ -59,7 +62,9 @@ $conf = new FS::Conf;
 my $mydomain = $conf->config('domain');
 
 my($action,$svcnum,$svc_acct_sm,$pkgnum,$svcpart,$part_svc);
-if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
+
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
@@ -80,7 +85,7 @@ if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 
   $svc_acct_sm=create FS::svc_acct_sm({});
 
-  foreach $_ (split(/-/,$cgi->query_string)) { #get & untaint pkgnum & svcpart
+  foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index 3d0a2e723..6373ebb48 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.3 1998-12-17 06:17:12 ivan Exp $
+# $Id: svc_domain.cgi,v 1.4 1998-12-23 03:00:16 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
@@ -17,7 +17,10 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.3  1998-12-17 06:17:12  ivan
+# Revision 1.4  1998-12-23 03:00:16  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:12  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/11/13 09:56:48  ivan
@@ -38,7 +41,8 @@ my($cgi) = new CGI;
 
 my($action,$svcnum,$svc_domain,$pkgnum,$svcpart,$part_svc);
 
-if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
@@ -59,7 +63,7 @@ if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 
   $svc_domain=create FS::svc_domain({});
   
-  foreach $_ (split(/-/,$cgi->query_string)) {
+  foreach $_ (split(/-/,$query)) {
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
diff --git a/htdocs/misc/bill.cgi b/htdocs/misc/bill.cgi
index 76f160289..430aefa4b 100755
--- a/htdocs/misc/bill.cgi
+++ b/htdocs/misc/bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: bill.cgi,v 1.2 1998-12-17 09:12:41 ivan Exp $
+# $Id: bill.cgi,v 1.3 1998-12-23 03:01:13 ivan Exp $
 #
 # s/FS:Search/FS::Record/ and cgisuidsetup($cgi) ivan@sisd.com 98-mar-13
 #
@@ -8,7 +8,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: bill.cgi,v $
-# Revision 1.2  1998-12-17 09:12:41  ivan
+# Revision 1.3  1998-12-23 03:01:13  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:41  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -24,7 +27,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 #untaint custnum
-$cgi->query_string =~ /^(\d*)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d*)$/;
 my($custnum)=$1;
 my($cust_main)=qsearchs('cust_main',{'custnum'=>$custnum});
 die "Can't find customer!\n" unless $cust_main;
diff --git a/htdocs/misc/cancel-unaudited.cgi b/htdocs/misc/cancel-unaudited.cgi
index 93edef372..4c5fbc7f3 100755
--- a/htdocs/misc/cancel-unaudited.cgi
+++ b/htdocs/misc/cancel-unaudited.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel-unaudited.cgi,v 1.2 1998-12-17 09:12:42 ivan Exp $
+# $Id: cancel-unaudited.cgi,v 1.3 1998-12-23 03:02:05 ivan Exp $
 #
 # Usage: cancel-unaudited.cgi svcnum
 #        http://server.name/path/cancel-unaudited.cgi pkgnum
@@ -18,7 +18,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel-unaudited.cgi,v $
-# Revision 1.2  1998-12-17 09:12:42  ivan
+# Revision 1.3  1998-12-23 03:02:05  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:42  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -35,7 +38,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint svcnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($svcnum)=$1;
 
 my($svc_acct) = qsearchs('svc_acct',{'svcnum'=>$svcnum});
diff --git a/htdocs/misc/cancel_pkg.cgi b/htdocs/misc/cancel_pkg.cgi
index a9aea3f2a..45afee8a1 100755
--- a/htdocs/misc/cancel_pkg.cgi
+++ b/htdocs/misc/cancel_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cancel_pkg.cgi,v 1.2 1998-12-17 09:12:43 ivan Exp $
+# $Id: cancel_pkg.cgi,v 1.3 1998-12-23 03:02:54 ivan Exp $
 #
 # Usage: cancel_pkg.cgi pkgnum
 #        http://server.name/path/cancel_pkg.cgi pkgnum
@@ -29,7 +29,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cancel_pkg.cgi,v $
-# Revision 1.2  1998-12-17 09:12:43  ivan
+# Revision 1.3  1998-12-23 03:02:54  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:43  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -45,7 +48,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-$cgi->query_string =~ /^(\d+)$/ || die "Illegal pkgnum";
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
index 7c7fd6688..6823365f5 100755
--- a/htdocs/misc/link.cgi
+++ b/htdocs/misc/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.2 1998-12-17 09:12:45 ivan Exp $
+# $Id: link.cgi,v 1.3 1998-12-23 03:03:39 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody
 #
@@ -11,7 +11,10 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.2  1998-12-17 09:12:45  ivan
+# Revision 1.3  1998-12-23 03:03:39  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:45  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -34,7 +37,8 @@ my($cgi) = new CGI;
 cgisuidsetup($cgi);
 
 my($pkgnum,$svcpart);
-foreach $_ (split(/-/,$cgi->query_string)) { #get & untaint pkgnum & svcpart
+my($query) = $cgi->keywords;
+foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
   $pkgnum=$1 if /^pkgnum(\d+)$/;
   $svcpart=$1 if /^svcpart(\d+)$/;
 }
diff --git a/htdocs/misc/print-invoice.cgi b/htdocs/misc/print-invoice.cgi
index 546b93ed6..0ece4261e 100755
--- a/htdocs/misc/print-invoice.cgi
+++ b/htdocs/misc/print-invoice.cgi
@@ -1,12 +1,15 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: print-invoice.cgi,v 1.2 1998-12-17 09:12:47 ivan Exp $
+# $Id: print-invoice.cgi,v 1.3 1998-12-23 03:04:24 ivan Exp $
 #
 # just a kludge for now, since this duplicates in a way it shouldn't stuff from
 # Bill.pm (like $lpr) ivan@sisd.com 98-jun-16
 #
 # $Log: print-invoice.cgi,v $
-# Revision 1.2  1998-12-17 09:12:47  ivan
+# Revision 1.3  1998-12-23 03:04:24  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:47  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -26,7 +29,8 @@ $conf = new FS::Conf;
 my $lpr = $conf->config('lpr');
 
 #untaint invnum
-$cgi->query_string =~ /^(\d*)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d*)$/;
 my($invnum)=$1;
 my($cust_bill)=qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
diff --git a/htdocs/misc/susp_pkg.cgi b/htdocs/misc/susp_pkg.cgi
index cb20f82b2..7b8096470 100755
--- a/htdocs/misc/susp_pkg.cgi
+++ b/htdocs/misc/susp_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: susp_pkg.cgi,v 1.2 1998-12-17 09:12:48 ivan Exp $
+# $Id: susp_pkg.cgi,v 1.3 1998-12-23 03:04:56 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
@@ -23,7 +23,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: susp_pkg.cgi,v $
-# Revision 1.2  1998-12-17 09:12:48  ivan
+# Revision 1.3  1998-12-23 03:04:56  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:48  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -38,7 +41,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-$cgi->query_string =~ /^(\d+)$/ || die "Illegal pkgnum";
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
diff --git a/htdocs/misc/unsusp_pkg.cgi b/htdocs/misc/unsusp_pkg.cgi
index 82ecb748e..170d85f8a 100755
--- a/htdocs/misc/unsusp_pkg.cgi
+++ b/htdocs/misc/unsusp_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: unsusp_pkg.cgi,v 1.2 1998-12-17 09:12:49 ivan Exp $
+# $Id: unsusp_pkg.cgi,v 1.3 1998-12-23 03:05:25 ivan Exp $
 #
 # Usage: susp_pkg.cgi pkgnum
 #        http://server.name/path/susp_pkg.cgi pkgnum
@@ -23,7 +23,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: unsusp_pkg.cgi,v $
-# Revision 1.2  1998-12-17 09:12:49  ivan
+# Revision 1.3  1998-12-23 03:05:25  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:12:49  ivan
 # s/CGI::(Request|Base)/CGI.pm/;
 #
 
@@ -39,7 +42,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
  
 #untaint pkgnum
-$cgi->query_string =~ /^(\d+)$/ || die "Illegal pkgnum";
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal pkgnum";
 my($pkgnum)=$1;
 
 my($cust_pkg) = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index 12d601a01..d1db3747a 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,14 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.2 1998-12-17 09:41:09 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.3 1998-12-23 03:05:59 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.2  1998-12-17 09:41:09  ivan
+# Revision 1.3  1998-12-23 03:05:59  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:41:09  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -21,7 +24,7 @@ my($cgi)=new CGI;
 
 my(@cust_pkg,$sortby);
 
-my($query)=$cgi->query_string;
+my($query)=$cgi->keywords;
 #this tree is a little bit redundant
 if ( $query eq 'pkgnum' ) {
   $sortby=\*pkgnum_sort;
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 2b6c1ee4e..0afdb1a26 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.2 1998-12-17 09:41:10 ivan Exp $
+# $Id: svc_acct.cgi,v 1.3 1998-12-23 03:06:28 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.2  1998-12-17 09:41:10  ivan
+# Revision 1.3  1998-12-23 03:06:28  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:41:10  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -39,7 +42,7 @@ my($cgi)=new CGI;
 
 my(@svc_acct,$sortby);
 
-my($query)=$cgi->query_string;
+my($query)=$cgi->keywords;
 #this tree is a little bit redundant
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index 1fd6a515b..b902bbe1c 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.2 1998-12-17 09:41:12 ivan Exp $
+# $Id: svc_domain.cgi,v 1.3 1998-12-23 03:06:50 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -17,7 +17,10 @@
 # display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.2  1998-12-17 09:41:12  ivan
+# Revision 1.3  1998-12-23 03:06:50  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:41:12  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -34,7 +37,7 @@ my($cgi)=new CGI;
 my(@svc_domain);
 my($sortby);
 
-my($query)=$cgi->query_string;
+my($query)=$cgi->keywords;
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
   @svc_domain=qsearch('svc_domain',{});
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index e77f13d9b..06fd2d76d 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.2 1998-12-17 09:57:20 ivan Exp $
+# $Id: cust_bill.cgi,v 1.3 1998-12-23 03:07:49 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody.
 #
@@ -25,7 +25,10 @@
 # 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
+# Revision 1.3  1998-12-23 03:07:49  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.2  1998/12/17 09:57:20  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -42,7 +45,8 @@ my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 #untaint invnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($invnum)=$1;
 
 my($cust_bill) = qsearchs('cust_bill',{'invnum'=>$invnum});
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index bbe3db53d..034389755 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.3 1998-12-17 09:57:22 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.4 1998-12-23 03:08:40 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.3  1998-12-17 09:57:22  ivan
+# Revision 1.4  1998-12-23 03:08:40  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# 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
@@ -41,6 +44,11 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(popurl header);
 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;
 
 my($cgi) = new CGI;
 cgisuidsetup($cgi);
@@ -54,7 +62,7 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
 
 print $cgi->header, header('Package View', '');
 
-$cgi->query_string =~ /^(\d+)$/;
+$cgi->query_string =~ /^(\d+)$/ or die $cgi->query_string;
 my($pkgnum)=$1;
 
 #get package record
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 9fcc4c57c..e658d2bb8 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.3 1998-12-17 09:57:23 ivan Exp $
+# $Id: svc_acct.cgi,v 1.4 1998-12-23 03:09:19 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -35,7 +35,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.3  1998-12-17 09:57:23  ivan
+# Revision 1.4  1998-12-23 03:09:19  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# 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
@@ -57,7 +60,8 @@ $conf = new FS::Conf;
 my $mydomain = $conf->config('domain');
 
 #untaint svcnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($svcnum)=$1;
 my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svcnum});
 die "Unkonwn svcnum" unless $svc_acct;
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index a80e36845..f30fb429b 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.3 1998-12-17 09:57:24 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.4 1998-12-23 03:09:52 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -22,7 +22,10 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.3  1998-12-17 09:57:24  ivan
+# Revision 1.4  1998-12-23 03:09:52  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# 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
@@ -44,7 +47,8 @@ $conf = new FS::Conf;
 my $mydomain = $conf->config('domain');
 
 #untaint svcnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($svcnum)=$1;
 my($svc_acct_sm)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_acct_sm;
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index a903fa4ba..9abeebbf4 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.3 1998-12-17 09:57:25 ivan Exp $
+# $Id: svc_domain.cgi,v 1.4 1998-12-23 03:10:19 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.3  1998-12-17 09:57:25  ivan
+# Revision 1.4  1998-12-23 03:10:19  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# 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
@@ -33,7 +36,8 @@ my($cgi) = new CGI;
 cgisuidsetup($cgi);
 
 #untaint svcnum
-$cgi->query_string =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($svcnum)=$1;
 my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_domain;