[freeside-commits] branch FREESIDE_4_BRANCH updated. 55f757667dadf2e16b1c91bfe4c456accf6f7999
Ivan
ivan at 420.am
Wed Jun 29 10:54:17 PDT 2016
The branch, FREESIDE_4_BRANCH has been updated
via 55f757667dadf2e16b1c91bfe4c456accf6f7999 (commit)
from cfcfc1fe61d80d539ec73c29bc0b3f1518f09ec0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 55f757667dadf2e16b1c91bfe4c456accf6f7999
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Jun 29 10:54:16 2016 -0700
remove unneeded code
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 5612cfc..044e41d 100644
--- 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
diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm
index b28f057..a5e181d 100644
--- a/FS/FS/svc_pbx.pm
+++ b/FS/FS/svc_pbx.pm
@@ -141,18 +141,6 @@ 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.
-=cut
-
-sub insert {
- my $self = shift;
- my $error;
-
- $error = $self->SUPER::insert;
- return $error if $error;
-
- '';
-}
-
=item delete
Delete this record from the database.
@@ -206,18 +194,6 @@ sub delete {
Replaces the OLD_RECORD with this one in the database. If there is an error,
returns the error, otherwise returns false.
-=cut
-
-#sub replace {
-# my ( $new, $old ) = ( shift, shift );
-# my $error;
-#
-# $error = $new->SUPER::replace($old);
-# return $error if $error;
-#
-# '';
-#}
-
=item suspend
Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
diff --git a/FS/FS/svc_port.pm b/FS/FS/svc_port.pm
index 9d2dae8..e72ac49 100644
--- a/FS/FS/svc_port.pm
+++ b/FS/FS/svc_port.pm
@@ -107,52 +107,15 @@ 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.
-=cut
-
-sub insert {
- my $self = shift;
- my $error;
-
- $error = $self->SUPER::insert;
- return $error if $error;
-
- '';
-}
-
=item delete
Delete this record from the database.
-=cut
-
-sub delete {
- my $self = shift;
- my $error;
-
- $error = $self->SUPER::delete;
- return $error if $error;
-
- '';
-}
-
-
=item replace OLD_RECORD
Replaces the OLD_RECORD with this one in the database. If there is an error,
returns the error, otherwise returns false.
-=cut
-
-sub replace {
- my ( $new, $old ) = ( shift, shift );
- my $error;
-
- $error = $new->SUPER::replace($old);
- return $error if $error;
-
- '';
-}
-
=item suspend
Called by the suspend method of FS::cust_pkg (see L<FS::cust_pkg>).
-----------------------------------------------------------------------
Summary of changes:
FS/FS/svc_forward.pm | 75 +-------------------------------------------------
FS/FS/svc_pbx.pm | 24 ----------------
FS/FS/svc_port.pm | 37 -------------------------
3 files changed, 1 insertion(+), 135 deletions(-)
More information about the freeside-commits
mailing list