This commit was generated by cvs2svn to compensate for changes in r8593,

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

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index b9e8ff8..9e27a32 100644 (file)
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -66,9 +66,68 @@ database, see L<"insert">.
 
 =cut
 
 
 =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'; }
 
 sub table { 'svc_forward'; }
 

-=item insert
+=item search_sql STRING
+
+Class method which returns an SQL fragment to search for the given string.
+
+=cut
+
+sub search_sql {
+  my( $class, $string ) = @_;
+  $class->search_sql_field('src', $string);
+}
+
+=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 label {
+  my $self = shift;
+  my $tag = '';
+
+  if ( $self->srcsvc ) {
+    my $svc_acct = $self->srcsvc_acct(@_);
+    $tag = $svc_acct->email(@_);
+  } else {
+    $tag = $self->src;
+  }
+
+  $tag .= ' -> ';
+
+  if ( $self->dstsvc ) {
+    my $svc_acct = $self->dstsvc_acct(@_);
+    $tag .= $svc_acct->email(@_);
+  } else {
+    $tag .= $self->dst;
+  }
+
+  $tag;
+}
+
+
+=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.


@@ -76,6 +135,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 {


@@ -93,10 +158,7 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 

-  $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;


@@ -130,7 +192,7 @@ sub delete {
   local $FS::UID::Autocommit = 0;
   my $dbh = dbh;
 
   local $FS::UID::Autocommit = 0;
   my $dbh = dbh;
 

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

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


@@ -170,7 +232,7 @@ sub replace {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 

-  my $error = $new->SUPER::replace($old);
+  my $error = $new->SUPER::replace($old, @_);

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


@@ -243,17 +305,23 @@ sub check {
   #         || ! $self->dstsvc;
 
   if ( $self->src ) {
   #         || ! $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->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('');
   }
   } else {
     $self->dst('');
   }