From: ivan <ivan>
Date: Sun, 3 Jun 2001 10:51:54 +0000 (+0000)
Subject: fixes "Error reval-ing" and won't bill errors
X-Git-Tag: Root-of-freeside_vpopmail_support~16
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=5928d6721ca5328d9a687d914296a2dcc3156a11

fixes "Error reval-ing" and won't bill errors
---

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 00ddc828e..2d7dae41f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -608,6 +608,9 @@ sub bill {
     my $setup = 0;
     unless ( $cust_pkg->setup ) {
       my $setup_prog = $part_pkg->getfield('setup');
+      $setup_prog =~ /^(.*)$/ #presumably trusted
+        or die "Illegal setup for package ". $cust_pkg->pkgnum. ": $setup_prog";
+      $setup_prog = $1;
       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
@@ -629,6 +632,9 @@ sub bill {
          ( $cust_pkg->getfield('bill') || 0 ) < $time
     ) {
       my $recur_prog = $part_pkg->getfield('recur');
+      $recur_prog =~ /^(.*)$/ #presumably trusted
+        or die "Illegal recur for package ". $cust_pkg->pkgnum. ": $recur_prog";
+      $recur_prog = $1;
       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
@@ -1119,7 +1125,7 @@ sub check_invoicing_list {
 
 =head1 VERSION
 
-$Id: cust_main.pm,v 1.13 2001-05-07 02:07:38 ivan Exp $
+$Id: cust_main.pm,v 1.14 2001-06-03 10:51:54 ivan Exp $
 
 =head1 BUGS