correct web UI for svc_www services & no more @.domain in www_shellcommands export

4 files changed, 23 insertions, 16 deletions

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 5117eff45..26e6274a1 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -290,7 +290,7 @@ sub label {
     $tag = $svc_x->getfield('domain');
   } elsif ( $svcdb eq 'svc_www' ) {
     my $domain = qsearchs( 'domain_record', { 'recnum' => $svc_x->recnum } );
-    $tag = $domain->reczone;
+    $tag = $domain->zone;
   } elsif ( $svcdb eq 'svc_broadband' ) {
     $tag = $svc_x->ip_addr;
   } else {
diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 3297e6bfb..2f7e270dc 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -309,11 +309,30 @@ sub svc_domain {
   qsearchs('svc_domain', { svcnum => $self->svcnum } );
 }
 
+=item zone
+
+Returns the canonical zone name.
+
+=cut
+
+sub zone {
+  my $self = shift;
+  my $zone = $self->reczone; # or die ?
+  if ( $zone =~ /\.$/ ) {
+    $zone =~ s/\.$//;
+  } else {
+    my $svc_domain = $self->svc_domain; # or die ?
+    $zone .= '.'. $svc_domain->domain;
+    $zone =~ s/^\@\.//;
+  }
+  $zone;
+}
+
 =back
 
 =head1 VERSION
 
-$Id: domain_record.pm,v 1.12 2003-03-20 03:41:03 ivan Exp $
+$Id: domain_record.pm,v 1.13 2003-03-29 04:53:44 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index b3bfdfeff..20658c7a2 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -29,15 +29,7 @@ sub _export_command {
     ${$_} = $svc_www->getfield($_) foreach $svc_www->fields;
   }
   my $domain_record = $svc_www->domain_record; # or die ?
-  my $zone = $domain_record->reczone; # or die ?
-  if ( $zone =~ /\.$/ ) {
-    $zone =~ s/\.$//;
-  } else {
-    my $svc_domain = $domain_record->svc_domain; # or die ?
-    $zone .= '.'. $svc_domain->domain;
-    $zone =~ s/^\@\.//;
-  }
-
+  my $zone = $domain_record->zone; # or die ?
   my $svc_acct = $svc_www->svc_acct; # or die ?
   my $username = $svc_acct->username;
   my $homedir = $svc_acct->dir; # or die ?
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 9fa9661b1..442614491 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -28,11 +28,7 @@ my $email = $svc_acct->email;
 my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
   or die "svc_www: Unknown recnum ". $svc_www->recnum;
 
-my $www = $domain_record->reczone;
-unless ( $www =~ /\.$/ ) {
-  my $svc_domain = qsearchs('svc_domain', { svcnum=>$domain_record->svcnum } );
-  $www .= '.'. $svc_domain->domain;
-}
+my $www = $domain_record->zone;
 
 print header('Website View', menubar(
   ( ( $custnum )