From: ivan Date: Mon, 10 May 2004 09:59:06 +0000 (+0000) Subject: allow for multiple svc_acct svcparts X-Git-Tag: BEFORE_FINAL_MASONIZE~1106 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=cd7e487f34c2de4768670aef01f096d8530fb057 allow for multiple svc_acct svcparts --- diff --git a/bin/sendmail.import b/bin/sendmail.import index a55616dc3..b137433d9 100644 --- a/bin/sendmail.import +++ b/bin/sendmail.import @@ -20,11 +20,11 @@ adminsuidsetup $user; #$FS::domain_record::noserial_hack = 1; use vars qw($defaultdomain); -$defaultdomain = 'surferz.net'; +$defaultdomain = '295.ca'; -use vars qw($svcpart $forward_svcpart); -$svcpart = 2; -$forward_svcpart = 4; +use vars qw(@svcpart $forward_svcpart); +@svcpart = qw( 2 4 ); +$forward_svcpart = 7; use vars qw($spooldir); $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/sendmail"; @@ -144,7 +144,7 @@ sub svcnum_or_literal { my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } ); my $domsvc = $svc_domain ? $svc_domain->svcnum : ''; - my @svc_acct = grep { $_->cust_svc->svcpart == $svcpart } + my @svc_acct = grep { grep { $_->cust_svc->svcpart == $_ } @svcpart } qsearch('svc_acct', { 'username' => $username, 'domsvc' => $domsvc,