remove unneeded code

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

diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 9e27a32..044e41d 100644 (file)
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -141,34 +141,6 @@ 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 {
-  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 $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  $error = $self->SUPER::insert(@_);
-  if ($error) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  ''; #no error
-
-}
-
 =item delete
 
 Deletes this mail forwarding alias from the database.  If there is an error,
@@ -176,33 +148,6 @@ returns the error, otherwise returns false.
 
 The corresponding FS::cust_svc record will be deleted as well.
 
-=cut
-
-sub delete {
-  my $self = shift;
-
-  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;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-}
-
-
 =item replace OLD_RECORD
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
@@ -221,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
@@ -353,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