X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fcommunigate_pro.pm;h=9ea8401742c390c082b8540ec642df7487c4d283;hp=7f5cece59afa033b79e4755da94dce7ebf395c0d;hb=20f38e4c256094bd938b732950e8f93319f851a5;hpb=9a778387bc4bfc97d28b25a9c123700fc6c15062

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 7f5cece59..9ea840174 100644
--- 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;
+  $settings{'TrailerText'} = $svc_domain->trailer
+    if $svc_domain->trailer;
 
   my @options = ( $create, $svc_domain->domain, \%settings );
 
@@ -169,6 +171,10 @@ sub _export_insert_svc_domain {
     'MaxWebSize'       => $svc_domain->acct_def_file_quota,
     'MaxWebFile'       => $svc_domain->acct_def_file_maxnum,
     'MaxFileSize'      => $svc_domain->acct_def_file_maxsize,
+    'RulesAllowed'     => $svc_domain->acct_def_cgp_rulesallowed,
+    'RPOPAllowed'      =>($svc_domain->acct_def_cgp_rpopallowed    ?'YES':'NO'),
+    'MailToAll'        =>($svc_domain->acct_def_cgp_mailtoall      ?'YES':'NO'),
+    'AddMailTrailer'   =>($svc_domain->acct_def_cgp_addmailtrailer ?'YES':'NO'),
   );
   warn "WARNING: error queueing SetAccountDefaults job: $def_err"
     if $def_err;
@@ -325,6 +331,8 @@ sub _export_replace_svc_domain {
   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'} =
@@ -364,6 +372,10 @@ sub _export_replace_svc_domain {
     'MaxWebSize'       => $new->acct_def_file_quota,
     'MaxWebFile'       => $new->acct_def_file_maxnum,
     'MaxFileSize'      => $new->acct_def_file_maxsize,
+    'RulesAllowed'     => $new->acct_def_cgp_rulesallowed,
+    'RPOPAllowed'      => ( $new->acct_def_cgp_rpopallowed    ? 'YES' : 'NO' ),
+    'MailToAll'        => ( $new->acct_def_cgp_mailtoall      ? 'YES' : 'NO' ),
+    'AddMailTrailer'   => ( $new->acct_def_cgp_addmailtrailer ? 'YES' : 'NO' ),
   );
   warn "WARNING: error queueing SetAccountDefaults job: $def_err"
     if $def_err;
@@ -865,6 +877,7 @@ sub communigate_pro_command { #subroutine, not method
   my( $machine, $port, $login, $password, $method, @args ) = @_;
 
   eval "use CGP::CLI";
+  die $@ if $@;
 
   my $cli = new CGP::CLI( {
     'PeerAddr' => $machine,