communigate provisioning phase 2: add svc_domain.trailer -> communigate TrailerText...

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 2850d4f..082a03d 100644 (file)
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1715,6 +1715,7 @@ sub tables_hashref {
        'expiration_date', @date_type, '', '',
         #communigate pro fields (quota = MaxAccountSize)
         'max_accounts',     'int', 'NULL',       '', '', '',
        'expiration_date', @date_type, '', '',
         #communigate pro fields (quota = MaxAccountSize)
         'max_accounts',     'int', 'NULL',       '', '', '',

+        'trailer',         'text', 'NULL',       '', '', '',

         'cgp_aliases',  'varchar', 'NULL',      255, '', '',
         'cgp_accessmodes','varchar','NULL',     255, '', '', #DomainAccessModes
         'acct_def_password_selfchange','char', 'NULL',       1, '', '', 
         'cgp_aliases',  'varchar', 'NULL',      255, '', '',
         'cgp_accessmodes','varchar','NULL',     255, '', '', #DomainAccessModes
         'acct_def_password_selfchange','char', 'NULL',       1, '', '', 

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 7f5cece..37cc6ef 100644 (file)
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -141,6 +141,8 @@ sub _export_insert_svc_domain {
     if $svc_domain->max_accounts;
   $settings{'AdminDomainName'} = $svc_domain->parent_svc_x->domain
     if $svc_domain->parent_svcnum;
     if $svc_domain->max_accounts;
   $settings{'AdminDomainName'} = $svc_domain->parent_svc_x->domain
     if $svc_domain->parent_svcnum;

+  $settings{'TrailerText'} = $svc_domain->trailer
+    if $svc_domain->trailer;

 
   my @options = ( $create, $svc_domain->domain, \%settings );
 
 
   my @options = ( $create, $svc_domain->domain, \%settings );
 


@@ -325,6 +327,8 @@ sub _export_replace_svc_domain {
   my %settings = ();
   $settings{'AccountsLimit'} = $new->max_accounts
     if $old->max_accounts ne $new->max_accounts;
   my %settings = ();
   $settings{'AccountsLimit'} = $new->max_accounts
     if $old->max_accounts ne $new->max_accounts;

+  $settings{'TrailerText'} = $new->trailer
+    if $old->trailer ne $new->trailer;

   $settings{'DomainAccessModes'} = $new->cgp_accessmodes
     if $old->cgp_accessmodes ne $new->cgp_accessmodes;
   $settings{'AdminDomainName'} =
   $settings{'DomainAccessModes'} = $new->cgp_accessmodes
     if $old->cgp_accessmodes ne $new->cgp_accessmodes;
   $settings{'AdminDomainName'} =


@@ -865,6 +869,7 @@ sub communigate_pro_command { #subroutine, not method
   my( $machine, $port, $login, $password, $method, @args ) = @_;
 
   eval "use CGP::CLI";
   my( $machine, $port, $login, $password, $method, @args ) = @_;
 
   eval "use CGP::CLI";

+  die $@ if $@;

 
   my $cli = new CGP::CLI( {
     'PeerAddr' => $machine,
 
   my $cli = new CGP::CLI( {
     'PeerAddr' => $machine,

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index d6eaf25..5adbef5 100644 (file)
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -419,6 +419,7 @@ sub check {
   my $error = $self->ut_numbern('svcnum')
               || $self->ut_numbern('catchall')
               || $self->ut_numbern('max_accounts')
   my $error = $self->ut_numbern('svcnum')
               || $self->ut_numbern('catchall')
               || $self->ut_numbern('max_accounts')

+              || $self->ut_anything('trailer') #well

               || $self->ut_textn('cgp_aliases') #well
               || $self->ut_enum('acct_def_password_selfchange', [ '', 'Y' ])
               || $self->ut_enum('acct_def_password_recover',    [ '', 'Y' ])
               || $self->ut_textn('cgp_aliases') #well
               || $self->ut_enum('acct_def_password_selfchange', [ '', 'Y' ])
               || $self->ut_enum('acct_def_password_recover',    [ '', 'Y' ])

diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index c85dd3b..8b4f282 100755 (executable)
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -55,7 +55,7 @@ Available top-level domains: <% $export->option('tlds') %>
 % }
 
 % if ( $communigate
 % }
 
 % if ( $communigate

-%      && $part_svc->part_svc_column('max_accounts')->columnflag !~ /^[FA]$/ ) {
+%      && $part_svc->part_svc_column('cgp_aliases')->columnflag !~ /^[FA]$/ ) {

 
     <TR>
       <TD ALIGN="right">Aliases</TD>
 
     <TR>
       <TD ALIGN="right">Aliases</TD>


@@ -95,6 +95,22 @@ Available top-level domains: <% $export->option('tlds') %>
     <INPUT TYPE="hidden" NAME="cgp_accessmodes" VALUE="<% $svc_domain->cgp_accessmodes() |h %>">
 % }
 
     <INPUT TYPE="hidden" NAME="cgp_accessmodes" VALUE="<% $svc_domain->cgp_accessmodes() |h %>">
 % }
 

+% if ( $communigate
+%      && $part_svc->part_svc_column('trailer')->columnflag ne 'F' )
+% {
+
+  <TR>
+    <TD ALIGN="right">Mail trailer</TD>
+    <TD>
+      <TEXTAREA NAME="trailer" ROWS=5 COLS=60><% $svc_domain->trailer() |h %></TEXTAREA>
+    </TD>
+  </TR>
+
+% } else {
+    <INPUT TYPE="hidden" NAME="trailer" VALUE="<% $svc_domain->trailer() |h %>">
+% }
+
+

 </TABLE>
 <BR>
 
 </TABLE>
 <BR>
 

diff --git a/httemplate/view/svc_domain/basics.html b/httemplate/view/svc_domain/basics.html
index db4fac1..c9841f4 100644 (file)
--- a/httemplate/view/svc_domain/basics.html
+++ b/httemplate/view/svc_domain/basics.html
@@ -84,6 +84,13 @@ Service #<B><% $svcnum %></B>
   <TD BGCOLOR="#ffffff"><% $svc_domain->cgp_accessmodes %></TD>
 </TR>
 
   <TD BGCOLOR="#ffffff"><% $svc_domain->cgp_accessmodes %></TD>
 </TR>
 

+% if ( $svc_domain->trailer ) {
+  <TR>
+    <TD ALIGN="right">Mail trailer</TD>
+    <TD BGCOLOR="#ffffff"><PRE><% $svc_domain->trailer |h %></PRE></TD>
+  </TR>
+% }
+

 </TABLE></TD></TR></TABLE>
 
 <%init>
 </TABLE></TD></TR></TABLE>
 
 <%init>