Can't find string terminator "!" anywhere before EOF at queue.cgi line 42

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

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 5530251..8b8c359 100644 (file)
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( @ISA $whois_hack $conf $smtpmachine
   $tech_contact $from $to @nameservers @nameserver_ips @template
   @mxmachines @nsmachines $soadefaultttl $soaemail $soaexpire $soamachine
-  $soarefresh $soaretry
+  $soarefresh $soaretry $qshellmachine $nossh_hack
 );
 use Carp;
 use Mail::Internet;
@@ -279,7 +279,8 @@ sub delete {
     if qsearch( 'svc_acct', { 'domsvc' => $self->svcnum } );
 
   return "Can't delete a domain with (svc_acct_sm) mail aliases!"
-    if qsearch('svc_acct_sm', { 'domsvc' => $self->svcnum } );
+    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 } );
@@ -338,7 +339,7 @@ sub check {
 
   my $x = $self->setfixed;
   return $x unless ref($x);
-  my $part_svc = $x;
+  #my $part_svc = $x;
 
   my $error = $self->ut_numbern('svcnum')
               || $self->ut_numbern('catchall')
@@ -533,7 +534,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.17 2001-08-20 11:04:38 ivan Exp $
+$Id: svc_domain.pm,v 1.21 2001-10-22 12:22:03 ivan Exp $
 
 =head1 BUGS