projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
bin
/
sendmail.import
diff --git
a/bin/sendmail.import
b/bin/sendmail.import
index
a55616d
..
ef745fc
100644
(file)
--- a/
bin/sendmail.import
+++ b/
bin/sendmail.import
@@
-20,11
+20,11
@@
adminsuidsetup $user;
#$FS::domain_record::noserial_hack = 1;
use vars qw($defaultdomain);
#$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";
use vars qw($spooldir);
$spooldir = "/usr/local/etc/freeside/export.". datasrc. "/sendmail";
@@
-144,7
+144,9
@@
sub svcnum_or_literal {
my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
my $domsvc = $svc_domain ? $svc_domain->svcnum : '';
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 { my $svc_acct = $_;
+ grep { $svc_acct->cust_svc->svcpart == $_ } @svcpart
+ }
qsearch('svc_acct', {
'username' => $username,
'domsvc' => $domsvc,
qsearch('svc_acct', {
'username' => $username,
'domsvc' => $domsvc,