From: ivan Date: Thu, 17 Dec 1998 09:57:25 +0000 (+0000) Subject: s/CGI::(Base|Request)/CGI.pm/; X-Git-Tag: freeside_1_2_0~102 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=e03778f753c3458e669fb261a013e6c2931c2dd7 s/CGI::(Base|Request)/CGI.pm/; --- 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 < - - Invoice View - - - -

Invoice View

- View this customer (#$custnum) | Main menu -

- - - Enter payments (check/cash) against this invoice -
Reprint this invoice +my $p = popurl(2); +print $cgi->header, header('Invoice View', menubar( + "Main Menu" => $p, + "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", +)), <Enter payments (check/cash) against this invoice +
Reprint this invoice

(Printed $printed times) -

 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 <
-  
-    Package View
-  
-  
-    
-    Package View
-    
-    
-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 <
-  
-    Account View
-  
-  
-    Account View
-    
-
-END
+print $cgi->header, header('Account View', '');
 
+my $p = popurl(2);
 if ($pkgnum || $custnum) {
   print <View this package (#$pkgnum) | 
-View this customer (#$custnum) | 
+View this package (#$pkgnum) | 
+View this customer (#$custnum) | 
 END
 } else {
   print <Cancel this (unaudited)account |
+Cancel this (unaudited)account |
 END
 }
 
 print <Main menu

+Main menu

 Service #$svcnum
 END
 
-print qq!
Edit this information!;
+print qq!
Edit this information!;
 #print qq!
Send account information!;
 print qq!

General | Shell account | !;
 print qq!SLIP/PPP account!;
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 <
-  
-    Mail Alias View
-  
-  
-    Mail Alias View
-END
+print $cgi->header, header('Mail Alias View');
+
+my $p = popurl(2);
 if ($pkgnum || $custnum) {
   print <View this package (#$pkgnum) | 
-View this customer (#$custnum) | 
+View this package (#$pkgnum) | 
+View this customer (#$custnum) | 
 END
 } else {
   print <Cancel this (unaudited)account |
+Cancel this (unaudited)account |
 END
 }
 
 print <Main menuMain menuService #$svcnum
-    Edit this information
+    
Edit this information
     
 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, <
-  
-    Domain View
-  
-  
-    
Domain View
-    
-
-View this package (#$pkgnum) | 
-View this customer (#$custnum) | 
-Main menu

-    Service #$svcnum
+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",
+)), <Service #$svcnum
     
 END