From cefb9727ed4cdfacf3b967485d58b25fbea98c6b Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 23 Feb 2002 02:14:26 +0000
Subject: [PATCH] report fixes and cruft removal

---
 FS/FS/UID.pm                             |  5 +-
 bin/svc_acct.export                      |  3 +-
 httemplate/search/report_cc.cgi          | 87 +++++-------------------------
 httemplate/search/report_credit.cgi      | 90 +++++---------------------------
 httemplate/search/report_receivables.cgi | 12 +++--
 httemplate/search/report_tax.cgi         | 87 +++++-------------------------
 6 files changed, 54 insertions(+), 230 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 78fe156c3..78910195a 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -73,6 +73,9 @@ sub forksuidsetup {
   $user = shift;
   croak "fatal: adminsuidsetup called without arguements" unless $user;
 
+  $user =~ /^([\w\-\.]+)/ or croak "fatal: illegal user $user";
+  $user = $1;
+
   $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
   $ENV{'SHELL'} = '/bin/sh';
   $ENV{'IFS'} = " \t\n";
@@ -252,7 +255,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.12 2002-01-19 15:16:22 ivan Exp $
+$Id: UID.pm,v 1.13 2002-02-23 02:14:25 jeff Exp $
 
 =head1 BUGS
 
diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 11178c962..82a8935b6 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.33 2002-02-18 00:13:57 jeff Exp $
+# $Id: svc_acct.export,v 1.34 2002-02-23 02:14:26 jeff Exp $
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
@@ -9,7 +9,6 @@
 
 use strict;
 use vars qw($conf);
-use Archive::Tar;
 use Fcntl qw(:flock);
 use File::Path;
 use IO::Handle;
diff --git a/httemplate/search/report_cc.cgi b/httemplate/search/report_cc.cgi
index 908ad35cd..991c00831 100755
--- a/httemplate/search/report_cc.cgi
+++ b/httemplate/search/report_cc.cgi
@@ -1,75 +1,16 @@
 <%
-#!/usr/bin/perl -Tw
-#
-# $Id: report_cc.cgi,v 1.1 2002-02-22 23:18:33 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 96-mar-5
-#
-# need to look at table in results to make it more readable
-#
-# ivan@voicenet.com
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: report_cc.cgi,v $
-# Revision 1.1  2002-02-22 23:18:33  jeff
-# add some reporting features
-#
-# Revision 1.1  2002/02/05 15:22:00  jeff
-# preserving state prior to 1.4.0pre7 upgrade
-#
-# Revision 1.2  2000/09/20 19:25:19  jeff
-# local modifications
-#
-# Revision 1.1.1.1  2000/09/18 06:26:58  jeff
-# Import of Freeside 1.2.3
-#
-# Revision 1.10  1999/07/20 06:03:36  ivan
-# s/CGI::Request/CGI/; (how'd i miss that before?)
-#
-# Revision 1.9  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/02/28 00:03:56  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/02/09 09:22:58  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/01/19 05:14:16  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:40  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 09:41:11  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
 
 use strict;
-use vars qw( $conf $cgi $beginning $ending );
+use vars qw( $cgi $user $beginning $ending );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl idiot header table);
-use FS::Record qw(qsearch qsearchs);
-use FS::Conf;
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup getotaker );
+use FS::CGI qw( header );
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-$conf = new FS::Conf;
+$user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
 $beginning = $1;
@@ -77,18 +18,18 @@ $beginning = $1;
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 $ending = $1;
 
-  print $cgi->header( '-expires' => '-2m' ),
-        header('Credit Card Recipt Report Results');
+print $cgi->header( '-expires' => '-2m' ),
+  header('Credit Card Recipt Report Results');
 
-  open (REPORT, "/usr/bin/freeside-cc-receipts-report -v -s $beginning -d $ending freeside |");
+open (REPORT, "/usr/bin/freeside-cc-receipts-report -v -s $beginning -d $ending $user |");
 
-  print '<PRE>';
-  while(<REPORT>) {
-    print $_;
-  }
-  print '</PRE>';
+print '<PRE>';
+while(<REPORT>) {
+  print $_;
+}
+print '</PRE>';
 
-  print '</BODY></HTML>';
+print '</BODY></HTML>';
 
 %>
 
diff --git a/httemplate/search/report_credit.cgi b/httemplate/search/report_credit.cgi
index 8535e29cc..f4430c13f 100755
--- a/httemplate/search/report_credit.cgi
+++ b/httemplate/search/report_credit.cgi
@@ -1,78 +1,16 @@
 <%
-#!/usr/bin/perl -Tw
-#
-# $Id: report_credit.cgi,v 1.1 2002-02-22 23:18:33 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 96-mar-5
-#
-# need to look at table in results to make it more readable
-#
-# ivan@voicenet.com
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: report_credit.cgi,v $
-# Revision 1.1  2002-02-22 23:18:33  jeff
-# add some reporting features
-#
-# Revision 1.2  2002/02/19 14:24:53  jeff
-# might be functional now
-#
-# Revision 1.1  2002/02/05 15:22:00  jeff
-# preserving state prior to 1.4.0pre7 upgrade
-#
-# Revision 1.2  2000/09/20 19:25:19  jeff
-# local modifications
-#
-# Revision 1.1.1.1  2000/09/18 06:26:58  jeff
-# Import of Freeside 1.2.3
-#
-# Revision 1.10  1999/07/20 06:03:36  ivan
-# s/CGI::Request/CGI/; (how'd i miss that before?)
-#
-# Revision 1.9  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/02/28 00:03:56  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/02/09 09:22:58  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/01/19 05:14:16  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:40  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 09:41:11  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
 
 use strict;
-use vars qw( $conf $cgi $beginning $ending );
+use vars qw( $cgi $user $beginning $ending );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl idiot header table);
-use FS::Record qw(qsearch qsearchs);
-use FS::Conf;
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup getotaker );
+use FS::CGI qw( header );
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-$conf = new FS::Conf;
+$user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
 $beginning = $1;
@@ -80,18 +18,18 @@ $beginning = $1;
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 $ending = $1;
 
-  print $cgi->header( '-expires' => '-2m' ),
-        header('In House Credit Report Results');
+print $cgi->header( '-expires' => '-2m' ),
+  header('In House Credit Report Results');
 
-  open (REPORT, "/usr/bin/freeside-credit-report -v -s $beginning -d $ending freeside |");
+open (REPORT, "/usr/bin/freeside-credit-report -v -s $beginning -d $ending $user |");
 
-  print '<PRE>';
-  while(<REPORT>) {
-    print $_;
-  }
-  print '</PRE>';
+print '<PRE>';
+while(<REPORT>) {
+  print $_;
+}
+print '</PRE>';
 
-  print '</BODY></HTML>';
+print '</BODY></HTML>';
 
 %>
 
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 7113ad5a7..6b96ba7a5 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -1,18 +1,20 @@
 <%
 
 use strict;
-use vars qw( $cgi );
+use vars qw( $cgi $user );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup getotaker );
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
+$user = getotaker;
+
 print $cgi->header( '-expires' => '-2m' ),
-      header('Current Receivables Report Results');
+  header('Current Receivables Report Results');
 
-open (REPORT, "/usr/bin/freeside-receivables-report -v freeside |");
+open (REPORT, "/usr/bin/freeside-receivables-report -v $user |");
 
 print '<PRE>';
 while(<REPORT>) {
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 8062479b5..bedfdac5f 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,75 +1,16 @@
 <%
-#!/usr/bin/perl -Tw
-#
-# $Id: report_tax.cgi,v 1.1 2002-02-22 23:18:34 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# ivan@voicenet.com 96-mar-5
-#
-# need to look at table in results to make it more readable
-#
-# ivan@voicenet.com
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: report_tax.cgi,v $
-# Revision 1.1  2002-02-22 23:18:34  jeff
-# add some reporting features
-#
-# Revision 1.1  2002/02/05 15:22:00  jeff
-# preserving state prior to 1.4.0pre7 upgrade
-#
-# Revision 1.2  2000/09/20 19:25:19  jeff
-# local modifications
-#
-# Revision 1.1.1.1  2000/09/18 06:26:58  jeff
-# Import of Freeside 1.2.3
-#
-# Revision 1.10  1999/07/20 06:03:36  ivan
-# s/CGI::Request/CGI/; (how'd i miss that before?)
-#
-# Revision 1.9  1999/04/09 04:22:34  ivan
-# also table()
-#
-# Revision 1.8  1999/04/09 03:52:55  ivan
-# explicit & for table/itable/ntable
-#
-# Revision 1.7  1999/02/28 00:03:56  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/02/09 09:22:58  ivan
-# visual and bugfixes
-#
-# Revision 1.5  1999/01/19 05:14:16  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:40  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 09:41:11  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
 
 use strict;
-use vars qw( $conf $cgi $beginning $ending );
+use vars qw( $cgi $user $beginning $ending );
 use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl idiot header table);
-use FS::Record qw(qsearch qsearchs);
-use FS::Conf;
+use CGI::Carp qw( fatalsToBrowser );
+use FS::UID qw( cgisuidsetup getotaker );
+use FS::CGI qw( header );
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-$conf = new FS::Conf;
+$user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
 $beginning = $1;
@@ -77,18 +18,18 @@ $beginning = $1;
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 $ending = $1;
 
-  print $cgi->header( '-expires' => '-2m' ),
-        header('Tax Report Results');
+print $cgi->header( '-expires' => '-2m' ),
+  header('Tax Report Results');
 
-  open (REPORT, "/usr/bin/freeside-tax-report -v -s $beginning -d $ending freeside |");
+open (REPORT, "/usr/bin/freeside-tax-report -v -s $beginning -d $ending $user |");
 
-  print '<PRE>';
-  while(<REPORT>) {
-    print $_;
-  }
-  print '</PRE>';
+print '<PRE>';
+while(<REPORT>) {
+  print $_;
+}
+print '</PRE>';
 
-  print '</BODY></HTML>';
+print '</BODY></HTML>';
 
 %>
 
-- 
2.11.0