X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_domain.cgi;h=9b54422d36aeb3521de62957462b39258628abef;hp=78faf12b2fb00e7b10559106c687b6d9eacac0f4;hb=3f2a7b01b59902faed5767d81e2959e131bdbdfd;hpb=5fa9ce1b7c8b934e96a6a2f850a4e788eb76f495

diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 78faf12b2..9b54422d3 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -16,6 +16,7 @@
       <INPUT TYPE="text" NAME="domain" VALUE="<% $domain %>" SIZE=28 MAXLENGTH=63>
 %   } else {
       <B><% $domain %></B>
+      <INPUT TYPE="hidden" NAME="domain" VALUE="<% $domain %>">
 %   }
 
 % if ($export) {
@@ -34,159 +35,54 @@ Available top-level domains: <% $export->option('tlds') %>
 
 </TR>
 
+%    if($export->option('auoptions')) {
+%	# XXX: this whole thing should be done like svc_Common with label_fixup, etc. eventually
+	    <% include('/elements/tr-select.html',
+			'field' => 'au_eligibiilty_type',
+			'label' => 'AU Eligibility Type',
+			'value' => $svc_domain->au_eligibility_type,
+			'options' => $svc_domain->au_eligibility_type_values,
+	              )
+	    %>
+	    <% include('/elements/tr-input-text.html',
+			'field' => 'au_registrant_name',
+			'label' => 'AU Registrant Name',
+			'value' => $svc_domain->au_registrant_name,
+	              )
+	    %>
+%    }
+
 % }
   </TD>
 </TR>
 
-% if ( $communigate ) {
-  <TR>
-    <TD ALIGN="right">Administrator domain</TD>
-    <TD>
-      <% include('/elements/select-domain.html',
-                   'element_name' => 'parent_svcnum',
-                   'curr_value'   => $svc_domain->parent_svcnum,
-                   'empty_label'  => '(none)',
-                )
-      %>
-    </TD>
-  </TR>
-% } else {
-  <INPUT TYPE="hidden" NAME="parent_svcnum" VALUE="<% $svc_domain->parent_svcnum %>">
-% }
-
-% if ( $communigate
-%      && $part_svc->part_svc_column('max_accounts')->columnflag !~ /^[FA]$/ ) {
-
-    <TR>
-      <TD ALIGN="right">Aliases</TD>
-      <TD><INPUT TYPE="text" NAME="cgp_aliases" VALUE="<% $svc_domain->cgp_aliases %>"></TD>
-    </TR>
-
-% } else {
-    <INPUT TYPE="text" NAME="cgp_aliases" VALUE="<% $svc_domain->cgp_aliases %>">
-% }
-
-% if ( $part_svc->part_svc_column('max_accounts')->columnflag =~ /^[FA]$/ ) {
-    <INPUT TYPE="hidden" NAME="max_accounts" VALUE="<% $svc_domain->max_accounts %>">
+% if ( $part_svc->part_svc_column('quota')->columnflag =~ /^[FA]$/ ) {
+    <INPUT TYPE="hidden" NAME="quota" VALUE="<% $svc_domain->quota %>">
 % } else {
     <TR>
-      <TD ALIGN="right">Maximum number of accounts</TD>
+      <TD ALIGN="right">Quota</TD>
       <TD>
-        <INPUT TYPE="text" NAME="max_accounts" SIZE=5 MAXLENGTH=6 VALUE="<% $svc_domain->max_accounts %>">
+        <INPUT TYPE="text" NAME="quota" SIZE=8 VALUE="<% $svc_domain->quota %>">
       </TD>
     </TR>
 % }
 
-% if ( $communigate
-%      && $part_svc->part_svc_column('cgp_accessmodes')->columnflag ne 'F' )
-% {
-
-  <TR>
-    <TD ALIGN="right">Enabled services</TD>
-    <TD>
-      <% include( '/elements/communigate_pro-accessmodes.html',
-                    'curr_value' => $svc_domain->cgp_accessmodes,
-                )
-      %>
-    </TD>
-  </TR>
-
-% } else {
-    <INPUT TYPE="hidden" NAME="cgp_accessmodes" VALUE="<% $svc_domain->cgp_accessmodes() |h %>">
-% }
-
-</TABLE>
-<BR>
-
-% if ( $communigate ) {
-
-Account defaults
-<% ntable("#cccccc",2) %>
-
-  <% include('/elements/tr-checkbox.html',
-               'label'      =>'Password modification',
-               'field'      => 'acct_def_password_selfchange',
-               'curr_value' => $svc_domain->acct_def_password_selfchange,
-               'value'      => 'Y',
-            )
-  %>
-  <% include('/elements/tr-checkbox.html',
-               'label'      =>'Password recovery',
-               'field'      => 'acct_def_password_recover',
-               'curr_value' => $svc_domain->acct_def_password_recover,
-               'value'      => 'Y',
-            )
-  %>
-
-  <TR>
-    <TD ALIGN="right">Enabled services
-    </TD>
-    <TD><% include('/elements/communigate_pro-accessmodes.html',
-                     'element_name_prefix' => 'acct_def_cgp_accessmodes_',
-                     'curr_value' => $svc_domain->acct_def_cgp_accessmodes,
-                  )
-        %>
-    </TD>
-  </TR>
-
-  <% include('/elements/tr-input-text.html',
-               'label'      => 'Mail storage limit',
-               'field'      => 'acct_def_quota',
-               'curr_value' => $svc_domain->acct_def_quota,
-            )
-  %>
-  <% include('/elements/tr-input-text.html',
-               'label'      => 'File storage limit',
-               'field'      => 'acct_def_file_quota',
-               'curr_value' => $svc_domain->acct_def_file_quota,
-            )
-  %>
-  <% include('/elements/tr-input-text.html',
-               'label'      => 'Files limit',
-               'field'      => 'acct_def_file_maxnum',
-               'curr_value' => $svc_domain->acct_def_file_maxnum,
-            )
-  %>
-  <% include('/elements/tr-input-text.html',
-               'label'      => 'File size limit',
-               'field'      => 'acct_def_file_maxsize',
-               'curr_value' => $svc_domain->acct_def_file_maxsize,
-            )
-  %>
-
-%# false laziness w/svc_acct acct_def
-  <TR>
-    <TD ALIGN="right">Message delete method</TD>
-    <TD>
-      <SELECT NAME="acct_def_cgp_deletemode">
-%       for ( 'Move To Trash', 'Immediately', 'Mark' ) {
-          <OPTION VALUE="<% $_ %>"
-                  <% $_ eq $svc_domain->acct_def_cgp_deletemode ? 'SELECTED' : '' %>
-          ><% $_ %>
-%       }
-      </SELECT>
-    </TD>
-  </TR>
-
-  <% include('/elements/tr-input-text.html',
-               'label'      => 'On logout remove trash',
-               'curr_value' => $svc_domain->acct_def_cgp_emptytrash,
-            )
-  %>
+<% include('svc_domain/communigate-basics.html',
+             'svc_domain'  => $svc_domain,
+             'part_svc'    => $part_svc,
+             'communigate' => $communigate,
+          )
+%>
 
 </TABLE>
 <BR>
 
-% } else {
-
-%   foreach my $f (qw( password_selfchange password_recover cgp_accessmodes
-%                      quota file_quota file_maxnum file_maxsize
-%                      cgp_deletemode cgp_emptytrash
-%                 )) {
-      <INPUT TYPE="hidden" NAME="acct_def_<%$f%>" VALUE="<% $svc_domain->get("acct_def_$f") %>">
-%   }
-
-% }
+<% include('svc_domain/communigate-acct_defaults.html',
+             'svc_domain'  => $svc_domain,
+             'part_svc'    => $part_svc,
+             'communigate' => $communigate,
+          )
+%>
 
 <INPUT TYPE="submit" VALUE="Submit">
 
@@ -263,8 +159,6 @@ my $export = $exports[0];
 # If we have a domain registration export, get the registrar object
 my $registrar = $export ? $export->registrar : '';
 
-my $otaker = getotaker;
-
 my $domain = $svc_domain->domain;
 
 my $p1 = popurl(1);