X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_domain.cgi;h=3fd898ba5cc9c83ff1321ef8367dab7eac62a539;hp=3f2d4736a05ff7dfe58b4249fbdb779ea4e2a6de;hb=e17528c356bb137bcff4c6934a2c7e254202838e;hpb=cc647ae934abe5c9d9a5fc12f020adfc566349d9

diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 3f2d4736a..3fd898ba5 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -62,7 +62,28 @@ Service #<B><% $svcnum %></B>
   </TR>
 % }
 
-% if ( $svc_domain->max_accounts ) {
+% if ( $communigate ) {
+
+  <TR>
+    <TD ALIGN="right">Administrator domain</TD>
+    <TD BGCOLOR="#ffffff">
+%     if ( $svc_domain->parent_svcnum ) {
+% #XXX agent-virt aware the link
+        <A HREF="svc_domain.cgi?<% $svc_domain->parent_svcnum %>"><% $svc_domain->parent_svc_x->domain %></A>
+%     } else {
+        <I>(none)</I>
+%     }
+    </TD>
+  </TR>
+
+  <TR>
+    <TD ALIGN="right">Aliases</TD>
+    <TD BGCOLOR="#ffffff"><% $svc_domain->cgp_aliases %></TD>
+  </TR>
+
+% }
+
+% if ( $communigate && $svc_domain->max_accounts ) {
   <TR>
     <TD ALIGN="right">Maximum number of Accounts</TD>
     <TD BGCOLOR="#ffffff"><% $svc_domain->max_accounts %></TD>
@@ -78,6 +99,11 @@ Service #<B><% $svcnum %></B>
   </TD>
 </TR>
 
+<TR>
+  <TD ALIGN="right">Enabled services</TD>
+  <TD BGCOLOR="#ffffff"><% $svc_domain->cgp_accessmodes %></TD>
+</TR>
+
 </TABLE></TD></TR></TABLE>
 <BR>
 
@@ -122,7 +148,7 @@ DNS records
 %        ) { 
 %   ( my $recdata = $domain_record->recdata ) =~ s/"/\\'\\'/g;
       (<A HREF="javascript:areyousure('<%$p%>misc/delete-domain_record.cgi?<%$domain_record->recnum%>', 'Delete \'<% $domain_record->reczone %> <% $type %> <% $recdata %>\' ?' )">delete</A>)
-% } 
+% }
       </td>
     </tr>
 
@@ -169,28 +195,7 @@ DNS records
 % }
 <BR>
 
-% my ( $settings, $defaults ) = $svc_domain->export_getsettings;
-% if ( keys %$settings ) {
-
-%# XXX a way to label this "Communigate pro settings".. just a config maybe
-  External settings
-  <% ntable('#cccccc',2) %>
-
-%   foreach my $key ( keys %$settings ) {
-      <TR>
-        <TD ALIGN="right"><% $key |h %></TD>
-        <TD BGCOLOR="<% $defaults->{$key} ? '#eeeeee' : '#ffffff' %>">
-          <% $defaults->{$key} ? '<I>' : '<B>' %>
-          <% $settings->{$key} |h %>
-          <% $defaults->{$key} ? '</I>' : '</B>' %>
-        </TD>
-      </TR>
-%   }
-
-  </TABLE>
-  <BR>
-
-% }
+<% include('elements/svc_export_settings.html', $svc_domain) %>
 
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
 
@@ -242,19 +247,16 @@ if ($svc_domain->catchall) {
 
 my $domain = $svc_domain->domain;
 
-my $status = 'Unknown';
-my %ops = ();
-
-my @exports = $part_svc->part_export();
-
-my $registrar;
-my $export;
+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
-foreach (@exports) {
-	$export = $_ if $_->can('registrar');
-}
+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 );