X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_domain.cgi;h=3938a3406709a49900ca43a58628cd31c370ac2e;hp=3fd898ba5cc9c83ff1321ef8367dab7eac62a539;hb=5fa9ce1b7c8b934e96a6a2f850a4e788eb76f495;hpb=a1807414d26dd7d4c3ce67310047944178b07363
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 3fd898ba5..3938a3406 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -18,181 +18,20 @@
<% include('/elements/error.html') %>
-Service #<% $svcnum %>
-% #if ( $conf->exists('svc_domain-edit_domain') ) {
- | Edit this domain
-% #}
-
-<% &ntable("#cccccc") %>| <% &ntable("#cccccc",2) %>
-
- |
- | Service |
- <% $part_svc->svc %> |
-
-
-
- | Domain |
-
- <% $domain %>
- (view whois information)
- |
-
-
-% if ($export) {
-
- | Registration status |
- <% $status %>
-
-% if ( $FS::CurrentUser::CurrentUser->access_right('Manage domain registration') ) {
-% if ( defined($ops{'register'}) ) {
- Register at <% $registrar->{'name'} %>
-% }
-% if ( defined($ops{'transfer'}) ) {
- Transfer to <% $registrar->{'name'} %>
-% }
-% if ( defined($ops{'renew'}) ) {
- Renew at <% $registrar->{'name'} %>
-% }
-% if ( defined($ops{'revoke'}) ) {
- Revoke
-% }
-% }
-
- |
-
-% }
-
-% if ( $communigate ) {
-
-
- | Administrator domain |
-
-% if ( $svc_domain->parent_svcnum ) {
-% #XXX agent-virt aware the link
- <% $svc_domain->parent_svc_x->domain %>
-% } else {
- (none)
-% }
- |
-
-
-
- | Aliases |
- <% $svc_domain->cgp_aliases %> |
-
-
-% }
-
-% if ( $communigate && $svc_domain->max_accounts ) {
-
- | Maximum number of Accounts |
- <% $svc_domain->max_accounts %> |
-
-% }
-
-
- | Catch all email |
- <% $email ? "$email" : '(none)' %>
-% if ( $FS::CurrentUser::CurrentUser->access_right('Edit domain catchall') ) {
- (change)
-% }
- |
-
-
-
- | Enabled services |
- <% $svc_domain->cgp_accessmodes %> |
-
-
-
+<% include('svc_domain/basics.html', $svc_domain,
+ 'part_svc' => $part_svc,
+ 'custnum' => $custnum,
+ )
+%>
-
-
-DNS records
-% my @records; if ( @records = $svc_domain->domain_record ) {
-
- <% include('/elements/table-grid.html') %>
-
-% my $bgcolor1 = '#eeeeee';
-% my $bgcolor2 = '#ffffff';
-% my $bgcolor = $bgcolor2;
-
-
- | Zone |
- Type |
- Data |
-
-
-% foreach my $domain_record ( @records ) {
-% my $type = $domain_record->rectype eq '_mstr'
-% ? "(slave)"
-% : $domain_record->recaf. ' '. $domain_record->rectype;
-
-
-
- | <% $domain_record->reczone %> |
- <% $type %> |
- <% $domain_record->recdata %>
-
-% unless ( $domain_record->rectype eq 'SOA'
-% || ! $FS::CurrentUser::CurrentUser->access_right('Edit domain nameservice')
-% ) {
-% ( my $recdata = $domain_record->recdata ) =~ s/"/\\'\\'/g;
- (delete)
-% }
- |
-
-
-
-% if ( $bgcolor eq $bgcolor1 ) {
-% $bgcolor = $bgcolor2;
-% } else {
-% $bgcolor = $bgcolor1;
-% }
-
-% }
-
-
-% }
-
-% if ( $FS::CurrentUser::CurrentUser->access_right('Edit domain nameservice') ) {
-
-
-
+<% include('svc_domain/acct_defaults.html', $svc_domain,
+ 'part_svc' => $part_svc,
+ )
+%>
+
-% }
+<% include('svc_domain/dns.html', $svc_domain ) %>
<% include('elements/svc_export_settings.html', $svc_domain) %>
@@ -238,43 +77,6 @@ if ($pkgnum) {
my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
die "Unknown svcpart" unless $part_svc;
-my $email = '';
-if ($svc_domain->catchall) {
- my $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } );
- die "Unknown svcpart" unless $svc_acct;
- $email = $svc_acct->email;
-}
-
my $domain = $svc_domain->domain;
-my $communigate = scalar($part_svc->part_export('communigate_pro'));
- # || scalar($part_svc->part_export('communigate_pro_singledomain'));
-
-# Find the first export that does domain registration
-my @exports = grep $_->can('registrar'), $part_svc->part_export;
-my $export = $exports[0];
-# If we have a domain registration export, get the registrar object
-my $registrar;
-my $status = 'Unknown';
-my %ops = ();
-if ($export) {
- $registrar = $export->registrar;
- my $domstat = $export->get_status( $svc_domain );
- if (defined($domstat->{'message'})) {
- $status = $domstat->{'message'};
- } elsif (defined($domstat->{'unregistered'})) {
- $status = 'Not registered';
- $ops{'register'} = "Register";
- } elsif (defined($domstat->{'status'})) {
- $status = $domstat->{'status'} . ' ' . $domstat->{'contact_email'} . ' ' . $domstat->{'last_update_time'};
- } elsif (defined($domstat->{'expdate'})) {
- $status = "Expires " . $domstat->{'expdate'};
- $ops{'renew'} = "Renew";
- $ops{'revoke'} = "Revoke";
- } else {
- $status = $domstat->{'reason'};
- $ops{'transfer'} = "Transfer";
- }
-}
-