X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_forward.pm;h=044e41da9cb27e0903b009989680cf9469615c2c;hp=b8d55fecba9a43a62615113930f370275929e66a;hb=8f1500df332a86f1abe55a046778e42b21459430;hpb=b8cfd0780aa40bb07f3215bf9cb58011f5e32a35

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index b8d55fecb..044e41da9 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -66,86 +66,87 @@ database, see L<"insert">.
 
 =cut
 
+
+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',
+    },
+  };
+}
+
 sub table { 'svc_forward'; }
 
-=item insert [ , OPTION => VALUE ... ]
+=item search_sql STRING
 
-Adds this mail forwarding alias to the database.  If there is an error, returns
-the error, otherwise returns false.
+Class method which returns an SQL fragment to search for the given string.
 
-The additional fields pkgnum and svcpart (see L<FS::cust_svc>) should be 
-defined.  An FS::cust_svc record will be created and inserted.
+=cut
 
-Currently available options are: I<depend_jobnum>
+sub search_sql {
+  my( $class, $string ) = @_;
+  $class->search_sql_field('src', $string);
+}
 
-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)).
+=item label [ END_TIMESTAMP [ START_TIMESTAMP ] ]
+
+Returns a text string representing this forward.
+
+END_TIMESTAMP and START_TIMESTAMP can optionally be passed when dealing with
+history records.
 
 =cut
 
-sub insert {
+sub label {
   my $self = shift;
-  my $error;
-
-  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 $tag = '';
 
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
+  if ( $self->srcsvc ) {
+    my $svc_acct = $self->srcsvc_acct(@_);
+    $tag = $svc_acct->email(@_);
+  } else {
+    $tag = $self->src;
+  }
 
-  $error = $self->check;
-  return $error if $error;
+  $tag .= ' -> ';
 
-  $error = $self->SUPER::insert(@_);
-  if ($error) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
+  if ( $self->dstsvc ) {
+    my $svc_acct = $self->dstsvc_acct(@_);
+    $tag .= $svc_acct->email(@_);
+  } else {
+    $tag .= $self->dst;
   }
 
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  ''; #no error
-
+  $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<FS::cust_svc>) should be 
+defined.  An FS::cust_svc record will be created and inserted.
 
-sub delete {
-  my $self = shift;
+Currently available options are: I<depend_jobnum>
 
-  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<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)).
 
-  $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
 
@@ -165,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
@@ -249,17 +232,23 @@ sub check {
   #         || ! $self->dstsvc;
 
   if ( $self->src ) {
-    $self->src =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)?$/
-       or return "Illegal src: ". $self->dst;
+    $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('');
   }
@@ -291,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