projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vpopmail restart export option
[freeside.git]
/
FS
/
FS
/
svc_domain.pm
diff --git
a/FS/FS/svc_domain.pm
b/FS/FS/svc_domain.pm
index
fd57713
..
0d71b27
100644
(file)
--- a/
FS/FS/svc_domain.pm
+++ b/
FS/FS/svc_domain.pm
@@
-251,10
+251,6
@@
sub delete {
return "Can't delete a domain which has accounts!"
if qsearch( 'svc_acct', { 'domsvc' => $self->svcnum } );
return "Can't delete a domain which has accounts!"
if qsearch( 'svc_acct', { 'domsvc' => $self->svcnum } );
- return "Can't delete a domain with (svc_acct_sm) mail aliases!"
- if defined( $FS::Record::dbdef->table('svc_acct_sm') )
- && qsearch('svc_acct_sm', { 'domsvc' => $self->svcnum } );
-
#return "Can't delete a domain with (domain_record) zone entries!"
# if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
#return "Can't delete a domain with (domain_record) zone entries!"
# if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
@@
-269,12
+265,6
@@
sub delete {
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
- my $error = $self->SUPER::delete;
- if ( $error ) {
- $dbh->rollback if $oldAutoCommit;
- return $error;
- }
-
foreach my $domain_record ( reverse $self->domain_record ) {
my $error = $domain_record->delete;
if ( $error ) {
foreach my $domain_record ( reverse $self->domain_record ) {
my $error = $domain_record->delete;
if ( $error ) {
@@
-282,6
+272,13
@@
sub delete {
return $error;
}
}
return $error;
}
}
+
+ my $error = $self->SUPER::delete;
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return $error;
+ }
+
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
}
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
}
@@
-294,7
+291,6
@@
returns the error, otherwise returns false.
sub replace {
my ( $new, $old ) = ( shift, shift );
sub replace {
my ( $new, $old ) = ( shift, shift );
- my $error;
return "Can't change domain - reorder."
if $old->getfield('domain') ne $new->getfield('domain');
return "Can't change domain - reorder."
if $old->getfield('domain') ne $new->getfield('domain');
@@
-449,10
+445,6
@@
sub submit_internic {
=back
=back
-=head1 VERSION
-
-$Id: svc_domain.pm,v 1.30 2002-05-31 00:18:57 khoff Exp $
-
=head1 BUGS
All BIND/DNS fields should be included (and exported).
=head1 BUGS
All BIND/DNS fields should be included (and exported).