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

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

diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 3297e6b..2f7e270 100644 (file)
--- 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