projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
self-service interface: add proper password changer and prevent "Setup my services...
[freeside.git]
/
FS
/
FS
/
svc_domain.pm
diff --git
a/FS/FS/svc_domain.pm
b/FS/FS/svc_domain.pm
index
2642146
..
bdaf79b
100644
(file)
--- a/
FS/FS/svc_domain.pm
+++ b/
FS/FS/svc_domain.pm
@@
-230,7
+230,11
@@
sub delete {
my $error = $domain_record->delete;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
my $error = $domain_record->delete;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
- return $error;
+ return "can't delete DNS entry: ".
+ join(' ', map $domain_record->$_(),
+ qw( reczone recaf rectype recdata )
+ ).
+ ":$error";
}
}
}
}
@@
-364,11
+368,13
@@
sub domain_record {
my $self = shift;
my %order = (
my $self = shift;
my %order = (
- SOA => 1,
- NS => 2,
- MX => 3,
- CNAME => 4,
- A => 5,
+ 'SOA' => 1,
+ 'NS' => 2,
+ 'MX' => 3,
+ 'CNAME' => 4,
+ 'A' => 5,
+ 'TXT' => 6,
+ 'PTR' => 7,
);
sort { $order{$a->rectype} <=> $order{$b->rectype} }
);
sort { $order{$a->rectype} <=> $order{$b->rectype} }