[freeside-commits] branch master updated. c2746333f313511c6f7e19bdbef5622d1e4014e0

[Ivan]

The branch, master has been updated
       via  c2746333f313511c6f7e19bdbef5622d1e4014e0 (commit)
       via  d6abfe4e240cc8b9994390e956d109663ee898a1 (commit)
       via  a0d5cc19b565ca5361bb3a3f0753f86a7b49fc69 (commit)
       via  de349e3e7a40e5e2c3afc15b1d19c508bf53bd0d (commit)
      from  676ab983c5feb9ea69656db32f8a94bc42a3f226 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c2746333f313511c6f7e19bdbef5622d1e4014e0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 26 13:18:10 2013 -0800

    untaint spam tag levels

diff --git a/FS/FS/part_export/status_shellcommands.pm b/FS/FS/part_export/status_shellcommands.pm
index 53d2b37..c5200ec 100644
--- a/FS/FS/part_export/status_shellcommands.pm
+++ b/FS/FS/part_export/status_shellcommands.pm
@@ -43,6 +43,10 @@ sub _export_unsuspend {}
 sub export_setstatus {
   my($self, $svc_acct, $hashref) = @_;
 
+  for (qw( spam_tag2_level spam_kill_level )) {
+    $hashref->{$_} =~ /^\d+(\.\d+)?$/ or return "illegal $_";
+  }
+
   my @shellargs = (
     $svc_acct->svcnum,
     user          => $self->option('user') || 'root',

commit d6abfe4e240cc8b9994390e956d109663ee898a1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 26 13:16:35 2013 -0800

    simplify description

diff --git a/FS/FS/part_event/Condition/has_pkgpart.pm b/FS/FS/part_event/Condition/has_pkgpart.pm
index c54b7e2..d85e1bd 100644
--- a/FS/FS/part_event/Condition/has_pkgpart.pm
+++ b/FS/FS/part_event/Condition/has_pkgpart.pm
@@ -4,7 +4,7 @@ use strict;
 
 use base qw( FS::part_event::Condition );
 
-sub description { 'Customer has uncancelled package of specified definitions'; }
+sub description { 'Customer has uncancelled specific package(s)'; }
 
 sub eventtable_hashref {
     { 'cust_main' => 1,
@@ -27,7 +27,6 @@ sub condition {
 
   my $cust_main = $self->cust_main($object);
 
-  #XXX test
   my $if_pkgpart = $self->option('if_pkgpart') || {};
   grep $if_pkgpart->{ $_->pkgpart }, $cust_main->ncancelled_pkgs;
 

commit a0d5cc19b565ca5361bb3a3f0753f86a7b49fc69
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 26 13:15:48 2013 -0800

    sane weight for obscure format

diff --git a/FS/FS/cdr/telstra.pm b/FS/FS/cdr/telstra.pm
index 9e644db..603d5c4 100644
--- a/FS/FS/cdr/telstra.pm
+++ b/FS/FS/cdr/telstra.pm
@@ -19,7 +19,7 @@ my %cdr_type_of = (
 
 %info = (
   'name'          => 'Telstra LinxOnline',
-  'weight'        => 20,
+  'weight'        => 215,
   'header'        => 1,
   'type'          => 'fixedlength',
   # Wholesale Usage Information Record format

commit de349e3e7a40e5e2c3afc15b1d19c508bf53bd0d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 26 13:15:17 2013 -0800

    doc

diff --git a/FS/FS/Cron/upload.pm b/FS/FS/Cron/upload.pm
index 628c680..03ed366 100644
--- a/FS/FS/Cron/upload.pm
+++ b/FS/FS/Cron/upload.pm
@@ -470,7 +470,7 @@ sub spool_upload {
 
 }
 
-=item send_report CONFIG PARAMS
+=item prepare_report CONFIG PARAMS
 
 Retrieves the config value named CONFIG, parses it as a Text::Template,
 extracts "to" and "subject" headers, and returns a hash that can be passed

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Cron/upload.pm                      |    2 +-
 FS/FS/cdr/telstra.pm                      |    2 +-
 FS/FS/part_event/Condition/has_pkgpart.pm |    3 +--
 FS/FS/part_export/status_shellcommands.pm |    4 ++++
 4 files changed, 7 insertions(+), 4 deletions(-)