X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_forward.pm;h=044e41da9cb27e0903b009989680cf9469615c2c;hp=2b1fb922592f86c2e1c3a3aa7b8026ddf95f5dc9;hb=8f1500df332a86f1abe55a046778e42b21459430;hpb=c0567c688084e89fcd11bf82348b6c418f1254ac diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm index 2b1fb9225..044e41da9 100644 --- a/FS/FS/svc_forward.pm +++ b/FS/FS/svc_forward.pm @@ -47,9 +47,11 @@ inherits from FS::Record. The following fields are currently supported: =item srcsvc - svcnum of the source of the forward (see L) +=item src - literal source (username or full email address) + =item dstsvc - svcnum of the destination of the forward (see L) -=item dst - foreign destination (email address) - forward not local to freeside +=item dst - literal destination (username or full email address) =back @@ -64,80 +66,87 @@ database, see L<"insert">. =cut -sub table { 'svc_forward'; } -=item insert +sub table_info { + { + 'name' => 'Forward', + 'name_plural' => 'Mail forwards', + 'display_weight' => 30, + 'cancel_weight' => 30, + 'fields' => { + 'srcsvc' => 'service from which mail is to be forwarded', + 'dstsvc' => 'service to which mail is to be forwarded', + 'dst' => 'someone@another.domain.com to use when dstsvc is 0', + }, + }; +} -Adds this mail forwarding alias to the database. If there is an error, returns -the error, otherwise returns false. +sub table { 'svc_forward'; } -The additional fields pkgnum and svcpart (see L) should be -defined. An FS::cust_svc record will be created and inserted. +=item search_sql STRING + +Class method which returns an SQL fragment to search for the given string. =cut -sub insert { - my $self = shift; - my $error; +sub search_sql { + my( $class, $string ) = @_; + $class->search_sql_field('src', $string); +} - local $SIG{HUP} = 'IGNORE'; - local $SIG{INT} = 'IGNORE'; - local $SIG{QUIT} = 'IGNORE'; - local $SIG{TERM} = 'IGNORE'; - local $SIG{TSTP} = 'IGNORE'; - local $SIG{PIPE} = 'IGNORE'; +=item label [ END_TIMESTAMP [ START_TIMESTAMP ] ] - my $oldAutoCommit = $FS::UID::AutoCommit; - local $FS::UID::AutoCommit = 0; - my $dbh = dbh; +Returns a text string representing this forward. - $error = $self->check; - return $error if $error; +END_TIMESTAMP and START_TIMESTAMP can optionally be passed when dealing with +history records. + +=cut + +sub label { + my $self = shift; + my $tag = ''; - $error = $self->SUPER::insert; - if ($error) { - $dbh->rollback if $oldAutoCommit; - return $error; + if ( $self->srcsvc ) { + my $svc_acct = $self->srcsvc_acct(@_); + $tag = $svc_acct->email(@_); + } else { + $tag = $self->src; } - $dbh->commit or die $dbh->errstr if $oldAutoCommit; - ''; #no error + $tag .= ' -> '; + + if ( $self->dstsvc ) { + my $svc_acct = $self->dstsvc_acct(@_); + $tag .= $svc_acct->email(@_); + } else { + $tag .= $self->dst; + } + $tag; } -=item delete -Deletes this mail forwarding alias from the database. If there is an error, -returns the error, otherwise returns false. +=item insert [ , OPTION => VALUE ... ] -The corresponding FS::cust_svc record will be deleted as well. +Adds this mail forwarding alias to the database. If there is an error, returns +the error, otherwise returns false. -=cut +The additional fields pkgnum and svcpart (see L) should be +defined. An FS::cust_svc record will be created and inserted. -sub delete { - my $self = shift; +Currently available options are: I - local $SIG{HUP} = 'IGNORE'; - local $SIG{INT} = 'IGNORE'; - local $SIG{QUIT} = 'IGNORE'; - local $SIG{TERM} = 'IGNORE'; - local $SIG{TSTP} = 'IGNORE'; - local $SIG{PIPE} = 'IGNORE'; - - my $oldAutoCommit = $FS::UID::AutoCommit; - local $FS::UID::Autocommit = 0; - my $dbh = dbh; - - my $error = $self->SUPER::delete; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return $error; - } +If I is set (to a scalar jobnum or an array reference of +jobnums), all provisioning jobs will have a dependancy on the supplied +jobnum(s) (they will not run until the specific job(s) complete(s)). - $dbh->commit or die $dbh->errstr if $oldAutoCommit; - ''; -} +=item delete + +Deletes this mail forwarding alias from the database. If there is an error, +returns the error, otherwise returns false. +The corresponding FS::cust_svc record will be deleted as well. =item replace OLD_RECORD @@ -157,25 +166,7 @@ sub replace { return "Can't change both source and destination of a mail forward!" } - local $SIG{HUP} = 'IGNORE'; - local $SIG{INT} = 'IGNORE'; - local $SIG{QUIT} = 'IGNORE'; - local $SIG{TERM} = 'IGNORE'; - local $SIG{TSTP} = 'IGNORE'; - local $SIG{PIPE} = 'IGNORE'; - - my $oldAutoCommit = $FS::UID::AutoCommit; - local $FS::UID::AutoCommit = 0; - my $dbh = dbh; - - my $error = $new->SUPER::replace($old); - if ($error) { - $dbh->rollback if $oldAutoCommit; - return $error; - } - - $dbh->commit or die $dbh->errstr if $oldAutoCommit; - ''; + $new->SUPER::replace($old, @_); } =item suspend @@ -214,12 +205,19 @@ sub check { #my $part_svc = $x; my $error = $self->ut_numbern('svcnum') - || $self->ut_number('srcsvc') + || $self->ut_numbern('srcsvc') || $self->ut_numbern('dstsvc') ; return $error if $error; - return "Unknown srcsvc" unless $self->srcsvc_acct; + return "Both srcsvc and src were defined; only one can be specified" + if $self->srcsvc && $self->src; + + return "one of srcsvc or src is required" + unless $self->srcsvc || $self->src; + + return "Unknown srcsvc: ". $self->srcsvc + unless ! $self->srcsvc || $self->srcsvc_acct; return "Both dstsvc and dst were defined; only one can be specified" if $self->dstsvc && $self->dst; @@ -227,26 +225,41 @@ sub check { return "one of dstsvc or dst is required" unless $self->dstsvc || $self->dst; - #return "Unknown dstsvc: $dstsvc" unless $self->dstsvc_acct || ! $self->dstsvc; - return "Unknown dstsvc" - unless qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } ) - || ! $self->dstsvc; + return "Unknown dstsvc: ". $self->dstsvc + unless ! $self->dstsvc || $self->dstsvc_acct; + #return "Unknown dstsvc" + # unless qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } ) + # || ! $self->dstsvc; + if ( $self->src ) { + $self->src =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/ + or return "Illegal src: ". $self->src; + $self->src("$1$2"); + } else { + $self->src(''); + } if ( $self->dst ) { - $self->dst =~ /^([\w\.\-]+)\@(([\w\-]+\.)+\w+)$/ - or return "Illegal dst: ". $self->dst; - $self->dst("$1\@$2"); + my $conf = new FS::Conf; + if ( $conf->exists('svc_forward-arbitrary_dst') ) { + my $error = $self->ut_textn('dst'); + return $error if $error; + } else { + $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/ + or return "Illegal dst: ". $self->dst; + $self->dst("$1$2"); + } } else { $self->dst(''); } - ''; #no error + $self->SUPER::check; } =item srcsvc_acct -Returns the FS::svc_acct object referenced by the srcsvc column. +Returns the FS::svc_acct object referenced by the srcsvc column, or false for +literally specified forwards. =cut @@ -258,7 +271,7 @@ sub srcsvc_acct { =item dstsvc_acct Returns the FS::svc_acct object referenced by the srcsvc column, or false for -forwards not local to freeside. +literally specified forwards. =cut @@ -267,6 +280,54 @@ sub dstsvc_acct { qsearchs('svc_acct', { 'svcnum' => $self->dstsvc } ); } +=item src_email + +Returns the email address to be forwarded regardless of weither it is local +or remote + +=cut + +sub src_email { +my $self = shift; + +if ($self->srcsvc eq '0'){ + return $self->src; +} else { + my $svc_acct = $self->srcsvc_acct; + return $svc_acct->email; +}} + +=item dst_email + +Returns the email address which gets forwarded to regardless of weither it is local +or remote + +=cut + +sub dst_email { +my $self = shift; + +if ($self->dstsvc eq '0'){ + return $self->dst; +} else { + my $svc_acct = $self->dstsvc_acct; + return $svc_acct->email; +}} + +=item srcsvc_acct_domain + +Returns the domain of the srcsvc_acct + +=cut + +sub srcsvc_acct_domain { +my $self = shift; + + my $svc_acct = $self->srcsvc_acct; + return $svc_acct->domain; +} + + =back =head1 BUGS