projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was generated by cvs2svn to compensate for changes in r3874,
[freeside.git]
/
FS
/
FS
/
svc_domain.pm
diff --git
a/FS/FS/svc_domain.pm
b/FS/FS/svc_domain.pm
index
c88b3e6
..
2642146
100644
(file)
--- a/
FS/FS/svc_domain.pm
+++ b/
FS/FS/svc_domain.pm
@@
-7,7
+7,7
@@
use vars qw( @ISA $whois_hack $conf
);
use Carp;
use Date::Format;
);
use Carp;
use Date::Format;
-
use Net::Whois 1.0
;
+
#use Net::Whois::Raw
;
use FS::Record qw(fields qsearch qsearchs dbh);
use FS::Conf;
use FS::svc_Common;
use FS::Record qw(fields qsearch qsearchs dbh);
use FS::Conf;
use FS::svc_Common;
@@
-256,6
+256,8
@@
sub replace {
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');
+ # Better to do it here than to force the caller to remember that svc_domain is weird.
+ $new->setfield(action => 'M');
my $error = $new->SUPER::replace($old);
return $error if $error;
}
my $error = $new->SUPER::replace($old);
return $error if $error;
}
@@
-340,7
+342,8
@@
sub check {
" (or unknown registry - try \$whois_hack)";
}
" (or unknown registry - try \$whois_hack)";
}
- $recref->{action} =~ /^(M|N)$/ or return "Illegal action";
+ $recref->{action} =~ /^(M|N)$/
+ or return "Illegal action: ". $recref->{action};
$recref->{action} = $1;
if ( $recref->{catchall} ne '' ) {
$recref->{action} = $1;
if ( $recref->{catchall} ne '' ) {
@@
-384,15
+387,16
@@
sub catchall_svc_acct {
=item whois
=item whois
-Returns the Net::Whois::Domain object (see L<Net::Whois>) for this domain, or
-undef if the domain is not found in whois.
+
#
Returns the Net::Whois::Domain object (see L<Net::Whois>) for this domain, or
+
#
undef if the domain is not found in whois.
(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)
=cut
sub whois {
(If $FS::svc_domain::whois_hack is true, returns that in all cases instead.)
=cut
sub whois {
- $whois_hack or new Net::Whois::Domain $_[0]->domain;
+ #$whois_hack or new Net::Whois::Domain $_[0]->domain;
+ $whois_hack or die "whois_hack not set...\n";
}
=item _whois
}
=item _whois