add per-agent invoice templates, add per-package suspend invoice events, fix automati...

[freeside.git] / FS / FS / svc_forward.pm

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 2b1fb92..b8d55fe 100644 (file)
--- 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<FS::svc_acct>)
 
 
 =item srcsvc - svcnum of the source of the forward (see L<FS::svc_acct>)
 

+=item src - literal source (username or full email address)
+

 =item dstsvc - svcnum of the destination of the forward (see L<FS::svc_acct>)
 
 =item dstsvc - svcnum of the destination of the forward (see L<FS::svc_acct>)
 

-=item dst - foreign destination (email address) - forward not local to freeside
+=item dst - literal destination (username or full email address)

 
 =back
 
 
 =back
 


@@ -66,7 +68,7 @@ database, see L<"insert">.
 
 sub table { 'svc_forward'; }
 
 
 sub table { 'svc_forward'; }
 

-=item insert
+=item insert [ , OPTION => VALUE ... ]

 
 Adds this mail forwarding alias to the database.  If there is an error, returns
 the error, otherwise returns false.
 
 Adds this mail forwarding alias to the database.  If there is an error, returns
 the error, otherwise returns false.


@@ -74,6 +76,12 @@ the error, otherwise returns false.
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
 The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 

+Currently available options are: I<depend_jobnum>
+
+If I<depend_jobnum> 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)).
+

 =cut
 
 sub insert {
 =cut
 
 sub insert {


@@ -94,7 +102,7 @@ sub insert {
   $error = $self->check;
   return $error if $error;
 
   $error = $self->check;
   return $error if $error;
 

-  $error = $self->SUPER::insert;
+  $error = $self->SUPER::insert(@_);

   if ($error) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
   if ($error) {
     $dbh->rollback if $oldAutoCommit;
     return $error;


@@ -214,12 +222,19 @@ sub check {
   #my $part_svc = $x;
 
   my $error = $self->ut_numbern('svcnum')
   #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;
 
               || $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;
 
   return "Both dstsvc and dst were defined; only one can be specified"
     if $self->dstsvc && $self->dst;


@@ -227,26 +242,35 @@ sub check {
   return "one of dstsvc or dst is required"
     unless $self->dstsvc || $self->dst;
 
   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->dst;
+    $self->src("$1$2");
+  } else {
+    $self->src('');
+  }

 
   if ( $self->dst ) {
 
   if ( $self->dst ) {

-    $self->dst =~ /^([\w\.\-]+)\@(([\w\-]+\.)+\w+)$/
+    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)?$/

        or return "Illegal dst: ". $self->dst;
        or return "Illegal dst: ". $self->dst;

-    $self->dst("$1\@$2");
+    $self->dst("$1$2");

   } else {
     $self->dst('');
   }
 
   } else {
     $self->dst('');
   }
 

-  ''; #no error
+  $self->SUPER::check;

 }
 
 =item srcsvc_acct
 
 }
 
 =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
 
 
 =cut
 


@@ -258,7 +282,7 @@ sub srcsvc_acct {
 =item dstsvc_acct
 
 Returns the FS::svc_acct object referenced by the srcsvc column, or false for
 =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
 
 
 =cut