fix double // in relative URLs, s/CGI::Base/CGI/;

15 files changed, 174 insertions, 161 deletions

diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi
index fecfc54c9..44c1676b2 100755
--- a/htdocs/edit/agent.cgi
+++ b/htdocs/edit/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.2 1998-11-23 07:52:08 ivan Exp $
+# $Id: agent.cgi,v 1.3 1998-12-17 06:16:57 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -11,7 +11,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent.cgi,v $
-# Revision 1.2  1998-11-23 07:52:08  ivan
+# Revision 1.3  1998-12-17 06:16:57  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/23 07:52:08  ivan
 # *** empty log message ***
 #
 
@@ -39,10 +42,12 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$agent->hashref;
 
+my $p = popurl(2);
+
 print $cgi->header, header("$action Agent", menubar(
-  'Main Menu' => popurl(2),
-  'View all agents' => popurl(2). '/browse/agent.cgi',
-)), '<FORM ACTION="', popurl(1), '/process/agent.cgi" METHOD=POST>';
+  'Main Menu' => $p,
+  'View all agents' => $p. 'browse/agent.cgi',
+)), '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
       "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi
index 021ff6cf3..d9c0851aa 100755
--- a/htdocs/edit/agent_type.cgi
+++ b/htdocs/edit/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.5 1998-11-21 07:58:27 ivan Exp $
+# $Id: agent_type.cgi,v 1.6 1998-12-17 06:16:58 ivan Exp $
 #
 # agent_type.cgi: Add/Edit agent type (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.5  1998-11-21 07:58:27  ivan
+# Revision 1.6  1998-12-17 06:16:58  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.5  1998/11/21 07:58:27  ivan
 # package names link to them
 #
 # Revision 1.4  1998/11/21 07:45:19  ivan
@@ -54,9 +57,9 @@ my($hashref)=$agent_type->hashref;
 
 my($p)=popurl(2);
 print $cgi->header, header("$action Agent Type", menubar(
-  'Main Menu' => "$p/",
-  'View all agent types' => "$p/browse/agent_type.cgi",
-)), '<FORM ACTION="', popurl(1), '/process/agent_type.cgi" METHOD=POST>';
+  'Main Menu' => "$p",
+  'View all agent types' => "${p}browse/agent_type.cgi",
+)), '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
       "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
@@ -78,7 +81,7 @@ foreach $part_pkg ( qsearch('part_pkg',{}) ) {
           ? 'CHECKED '
           : '',
         qq!"VALUE="ON"> !,
-    qq!<A HREF="$p/edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
+    qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
     '">', $part_pkg->getfield('pkg'), '</A>',
   ;
 }
diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi
index 75ef21208..793a451e6 100755
--- a/htdocs/edit/cust_credit.cgi
+++ b/htdocs/edit/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_credit.cgi: Add a credit (output form)
+# $Id: cust_credit.cgi,v 1.2 1998-12-17 06:16:59 ivan Exp $
 #
 # Usage: cust_credit.cgi custnum [ -paybatch ]
 #        http://server.name/path/cust_credit?custnum [ -paybatch ]
@@ -23,34 +23,33 @@
 # ivan@voicenet.com 97-apr-21
 #
 # rewrite ivan@sisd.com 98-mar-16
+#
+# $Log: cust_credit.cgi,v $
+# Revision 1.2  1998-12-17 06:16:59  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
 use Date::Format;
-use CGI::Base qw(:DEFAULT :CGI); #CGI module
-use FS::UID qw(cgisuidsetup getotaker);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker popurl);
+use FS::CGI qw(header popurl);
+
+my $cgi = new CGI;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
 cgisuidsetup($cgi);
 
-#untaint custnum
-$QUERY_STRING =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($custnum)=$1;
 
-#untaint otaker
 my($otaker)=getotaker;
 
-SendHeaders(); # one guess.
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Post Credit</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Post Credit</H1>
-    </CENTER>
-    <FORM ACTION="process/cust_credit.cgi" METHOD=POST>
+my $p1 = popurl(1);
+
+print $cgi->header, header("Post Credit", ''), <<END;
+    <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
     <HR><PRE>
 END
 
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index fd36ab7d4..1a91f3dd8 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_main.cgi: Edit a customer (output form)
+# $Id: cust_main.cgi,v 1.3 1998-12-17 06:17:00 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,24 +38,28 @@
 #	bmccane@maxbaud.net	98-apr-3
 #
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
+#
+# $Log: cust_main.cgi,v $
+# Revision 1.3  1998-12-17 06:17:00  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header popurl);
 use FS::cust_main;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
 #get record
 my($custnum,$action,$cust_main);
-if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
   $custnum=$1;
   $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
   $action='Edit';
@@ -66,16 +70,9 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
   $action='Add';
 }
 
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Customer $action</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Customer $action</H1>
-    </CENTER>
-    <FORM ACTION="process/cust_main.cgi" METHOD=POST>
+my $p1 = popurl(1);'
+print $cgi->header, header("Customer $action", ''), <<END;
+    <FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST>
     <PRE>
 END
 
diff --git a/htdocs/edit/cust_main_county-expand.cgi b/htdocs/edit/cust_main_county-expand.cgi
index 9b687993f..eccb1d934 100755
--- a/htdocs/edit/cust_main_county-expand.cgi
+++ b/htdocs/edit/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.2 1998-11-18 09:01:38 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.3 1998-12-17 06:17:01 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.2  1998-11-18 09:01:38  ivan
+# Revision 1.3  1998-12-17 06:17:01  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/18 09:01:38  ivan
 # i18n! i18n!
 #
 
@@ -34,10 +37,11 @@ my($taxnum)=$1;
 my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum});
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
+my $p1 = popurl(1);
 print $cgi->header, header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 )), <<END;
-    <FORM ACTION="process/cust_main_county-expand.cgi" METHOD=POST>
+    <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
       Separate by
       <INPUT TYPE="radio" NAME="delim" VALUE="n" CHECKED>line
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
index 96574f0ef..537d5740a 100755
--- a/htdocs/edit/cust_main_county.cgi
+++ b/htdocs/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.2 1998-11-18 09:01:39 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.3 1998-12-17 06:17:02 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.2  1998-11-18 09:01:39  ivan
+# Revision 1.3  1998-12-17 06:17:02  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/18 09:01:39  ivan
 # i18n! i18n!
 #
 
@@ -30,7 +33,7 @@ my($cgi) = new CGI;
 print $cgi->header, header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
 )), qq!<FORM ACTION="!, popurl(1),
-    qq!/process/cust_main_county.cgi" METHOD=POST>!, table, <<END;
+    qq!process/cust_main_county.cgi" METHOD=POST>!, table, <<END;
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
diff --git a/htdocs/edit/cust_pay.cgi b/htdocs/edit/cust_pay.cgi
index a6cb204d1..a3a308803 100755
--- a/htdocs/edit/cust_pay.cgi
+++ b/htdocs/edit/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_pay.cgi: Add a payment (output form)
+# $Id: cust_pay.cgi,v 1.2 1998-12-17 06:17:03 ivan Exp $
 #
 # Usage: cust_pay.cgi invnum
 #        http://server.name/path/cust_pay.cgi?invnum
@@ -12,31 +12,29 @@
 # ivan@voicenet.com 96-dec-11
 #
 # rewrite ivan@sisd.com 98-mar-16
+#
+# $Log: cust_pay.cgi,v $
+# Revision 1.2  1998-12-17 06:17:03  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
 use Date::Format;
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 cgisuidsetup($cgi);
 
-#untaint invnum
-$QUERY_STRING =~ /^(\d+)$/;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($invnum)=$1;
 
-SendHeaders(); # one guess.
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Enter payment</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Enter payment</H1>
-    </CENTER>
-    <FORM ACTION="process/cust_pay.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("Enter payment", ''), <<END;
+    <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <HR><PRE>
 END
 
diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
index d7f143db4..68abf9698 100755
--- a/htdocs/edit/cust_pkg.cgi
+++ b/htdocs/edit/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# cust_pkg.cgi: Add/edit packages (output form)
+# $Id: cust_pkg.cgi,v 1.2 1998-12-17 06:17:04 ivan Exp $
 #
 # this is for changing packages around, not editing things within the package
 #
@@ -23,15 +23,21 @@
 #
 # fixed a pretty cool bug from above which caused a visual glitch ivan@sisd.com
 # 98-jun-1
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.2  1998-12-17 06:17:04  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
-use CGI::Base qw(:DEFAULT :CGI); # CGI module
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header popurl);
+use FS::part_pkg;
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
 my(%pkg,%comment);
@@ -41,22 +47,16 @@ foreach (qsearch('part_pkg', {})) {
 }
 
 #untaint custnum
-$QUERY_STRING =~ /^(\d+)$/;
+
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
 my($custnum)=$1;
 
 my($otaker)=&getotaker;
 
-SendHeaders();
-print <<END;
-<HTML>   
-  <HEAD>
-    <TITLE>Add/Edit Packages</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Add/Edit Packages</H1>
-    </CENTER>
-    <FORM ACTION="process/cust_pkg.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("Add/Edit Packages", ''), <<END;
+    <FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>
     <HR>
 END
 
diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index 7fd029b03..c30a85965 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.5 1998-11-21 07:12:26 ivan Exp $
+# $Id: part_pkg.cgi,v 1.6 1998-12-17 06:17:05 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,7 +13,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.5  1998-11-21 07:12:26  ivan
+# Revision 1.6  1998-12-17 06:17:05  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.5  1998/11/21 07:12:26  ivan
 # *** empty log message ***
 #
 # Revision 1.4  1998/11/21 07:11:08  ivan
@@ -69,8 +72,8 @@ my($hashref)=$part_pkg->hashref;
 
 print $cgi->header, header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
-  'View all packages' => popurl(2). '/browse/part_pkg.cgi',
-)), '<FORM ACTION="', popurl(1), '/process/part_pkg.cgi" METHOD=POST>';
+  'View all packages' => popurl(2). 'browse/part_pkg.cgi',
+)), '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
 
 if ( $cgi->param('clone') ) {
   print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
diff --git a/htdocs/edit/part_referral.cgi b/htdocs/edit/part_referral.cgi
index f29802239..4eeec9982 100755
--- a/htdocs/edit/part_referral.cgi
+++ b/htdocs/edit/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# agent.cgi: Add/Edit referral (output form)
+# $Id: part_referral.cgi,v 1.2 1998-12-17 06:17:06 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -10,22 +10,24 @@
 # confisuing typo on submit button ivan@sisd.com 98-jun-14
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.2  1998-12-17 06:17:06  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
-use CGI::Base;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::part_referral;
 use FS::CGI qw(header menubar);
 
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
-
 my($part_referral,$action);
 if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
   $part_referral=qsearchs('part_referral',{'refnum'=>$1});
@@ -36,11 +38,12 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$part_referral->hashref;
 
-print header("$action Referral", menubar(
-  'Main Menu' => '../',
-  'View all referrals' => "../browse/part_referral.cgi",
+my $p1 = popurl(1);
+print $cgi->header, header("$action Referral", menubar(
+  'Main Menu' => popurl(2),
+  'View all referrals' => popurl(2). "browse/part_referral.cgi",
 )), <<END;
-    <FORM ACTION="process/part_referral.cgi" METHOD=POST>
+    <FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>
 END
 
 #display
diff --git a/htdocs/edit/part_svc.cgi b/htdocs/edit/part_svc.cgi
index 6f0a322b5..6fbe19428 100755
--- a/htdocs/edit/part_svc.cgi
+++ b/htdocs/edit/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.3 1998-11-21 06:43:26 ivan Exp $
+# $Id: part_svc.cgi,v 1.4 1998-12-17 06:17:07 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.3  1998-11-21 06:43:26  ivan
+# Revision 1.4  1998-12-17 06:17:07  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.3  1998/11/21 06:43:26  ivan
 # visual
 #
 
@@ -40,8 +43,8 @@ my($hashref)=$part_svc->hashref;
 my $p = popurl(2);
 print $cgi->header, header("$action Service Definition", menubar(
   'Main Menu' => $p,
-  'View all services' => "$p/browse/part_svc.cgi",
-)), '<FORM ACTION="', popurl(1), '/process/part_svc.cgi" METHOD=POST>';
+  'View all services' => "${p}browse/part_svc.cgi",
+)), '<FORM ACTION="', popurl(1), 'process/part_svc.cgi" METHOD=POST>';
 
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$hashref->{svcpart}">!,
       "Service Part #", $hashref->{svcpart} ? $hashref->{svcpart} : "(NEW)";
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index 93af2eb73..dc9f6e91a 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.2 1998-12-16 05:17:28 ivan Exp $
+# $Id: svc_acct.cgi,v 1.3 1998-12-17 06:17:08 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -16,25 +16,32 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.3  1998-12-17 06:17:08  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
 
 use strict;
 use vars qw($conf);
-use CGI::Base qw(:DEFAULT :CGI);
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct qw(fields);
 use FS::Conf;
 
+my($cgi) = new CGI;
+&cgisuidsetup($cgi);
+
 $conf = new FS::Conf;
 my @shells = $conf->config('shells');
 
-my($cgi) = new CGI::Base;
-$cgi->get;
-&cgisuidsetup($cgi);
-
 my($action,$svcnum,$svc_acct,$pkgnum,$svcpart,$part_svc);
 
-if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
+my($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
@@ -55,7 +62,7 @@ if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
 
   $svc_acct=create FS::svc_acct({}); 
 
-  foreach $_ (split(/-/,$QUERY_STRING)) {
+  foreach $_ (split(/-/,$query)) {
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
@@ -97,17 +104,9 @@ my($username,$password)=(
 my($ulen)=$svc_acct->dbdef_table->column('username')->length;
 my($ulen2)=$ulen+2;
 
-SendHeaders();
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>$action $svc account</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>$action $svc account</H1>
-    </CENTER><HR>
-    <FORM ACTION="process/svc_acct.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("$action $svc account"), <<END;
+    <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index 58e8b7ee6..9695d9398 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_acct_pop.cgi: Add/Edit pop (output form)
+# $Id: svc_acct_pop.cgi,v 1.3 1998-12-17 06:17:10 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.2  1998-11-13 09:56:47  ivan
+# 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
 # change configuration file layout to support multiple distinct databases (with
 # own set of config files, export, etc.)
 #
@@ -37,11 +40,12 @@ if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 }
 my($hashref)=$svc_acct_pop->hashref;
 
+my $p1 = popurl(1);
 print $cgi->header, header("$action POP", menubar(
-  'Main Menu' => '../',
-  'View all POPs' => "../browse/svc_acct_pop.cgi",
+  'Main Menu' => popurl(2),
+  'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
 )), <<END;
-    <FORM ACTION="process/svc_acct_pop.cgi" METHOD=POST>
+    <FORM ACTION="${p1}process/svc_acct_pop.cgi" METHOD=POST>
 END
 
 #display
diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index 5493215a1..3f96efc4e 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.2 1998-12-16 05:19:15 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 06:17:11 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,29 +35,31 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.2  1998-12-16 05:19:15  ivan
+# 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
 # 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::CGI qw(header popurl);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct_sm qw(fields);
 use FS::Conf;
 
-$conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($cgi) = new CGI::Base;
-$cgi->get;
+my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
-SendHeaders(); # one guess.
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 my($action,$svcnum,$svc_acct_sm,$pkgnum,$svcpart,$part_svc);
-if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
+if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
@@ -78,7 +80,7 @@ if ( $QUERY_STRING =~ /^(\d+)$/ ) { #editing
 
   $svc_acct_sm=create FS::svc_acct_sm({});
 
-  foreach $_ (split(/-/,$QUERY_STRING)) { #get & untaint pkgnum & svcpart
+  foreach $_ (split(/-/,$cgi->query_string)) { #get & untaint pkgnum & svcpart
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
@@ -157,16 +159,9 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Mail Alias $action</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>Mail Alias $action</H1>
-    </CENTER>
-    <FORM ACTION="process/svc_acct_sm.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("Mail Alias $action", ''), <<END;
+    <FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>
 END
 
 #display
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index dd436334c..3d0a2e723 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# svc_domain.cgi: Add domain (output form)
+# $Id: svc_domain.cgi,v 1.3 1998-12-17 06:17:12 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.2  1998-11-13 09:56:48  ivan
+# 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
 # change configuration file layout to support multiple distinct databases (with
 # own set of config files, export, etc.)
 #
@@ -26,6 +29,7 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_domain qw(fields);
 
@@ -84,16 +88,9 @@ my($domain)=(
   $svc_domain->domain,
 );
 
-print $cgi->header, <<END;
-<HTML>
-  <HEAD>
-    <TITLE>$action $svc</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H1>$action $svc</H1>
-    </CENTER><HR>
-    <FORM ACTION="process/svc_domain.cgi" METHOD=POST>
+my $p1 = popurl(1);
+print $cgi->header, header("$action $svc", ''), <<END;
+    <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">