communigate provisioning phase 2: Domain:Account Defaults:Settings: RulesAllowed, RPOPAllowed, MailToAll, AddMailTrailer. RT#7514

5 files changed, 102 insertions, 4 deletions

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index b9ec26ae5..22c18aeda 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1562,6 +1562,11 @@ sub tables_hashref {
         'acct_def_file_maxsize',    'varchar', 'NULL', $char_d, '', '',
         'acct_def_cgp_deletemode',  'varchar', 'NULL', $char_d, '', '',
         'acct_def_cgp_emptytrash',  'varchar', 'NULL', $char_d, '', '',
+        'acct_def_cgp_rulesallowed','varchar', 'NULL', $char_d, '', '',
+        'acct_def_cgp_rpopallowed',    'char', 'NULL',       1, '', '', 
+        'acct_def_cgp_mailtoall',      'char', 'NULL',       1, '', '', 
+        'acct_def_cgp_addmailtrailer', 'char', 'NULL',       1, '', '', 
+
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ],
diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 37cc6ef26..9ea840174 100644
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -171,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;
@@ -368,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;
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 5adbef53e..f8c6615a5 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -430,6 +430,10 @@ sub check {
               || $self->ut_alphan('acct_def_maxsize')
               || $self->ut_alphasn('acct_def_cgp_deletemode')
               || $self->ut_alphan('acct_def_cgp_emptytrash')
+              || $self->ut_textn('acct_def_cgp_rulesallowed')
+              || $self->ut_enum('acct_def_cgp_rpopallowed', [ '', 'Y' ])
+              || $self->ut_enum('acct_def_cgp_mailtoall', [ '', 'Y' ])
+              || $self->ut_enum('acct_def_cgp_addmailtrailer', [ '', 'Y' ])
   ;
   return $error if $error;
 
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 8b4f282a6..0ec91bc84 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -120,14 +120,15 @@ Account defaults
 <% ntable("#cccccc",2) %>
 
   <% include('/elements/tr-checkbox.html',
-               'label'      =>'Password modification',
+               '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',
+               'label'      => 'Password recovery',
                'field'      => 'acct_def_password_recover',
                'curr_value' => $svc_domain->acct_def_password_recover,
                'value'      => 'Y',
@@ -170,6 +171,41 @@ Account defaults
             )
   %>
 
+  <% include('/elements/tr-select.html',
+               'label'      => 'Allowed mail rules',
+               'field'      => 'acct_def_cgp_rulesallowed',
+               'options'    => [ '', 'No', 'Filter Only', 'All But Exec', 'Any' ],
+               'labels'     => {
+                                 '' => 'default (No)', #No always the default?
+                               },
+              'curr_value'  => $svc_domain->acct_def_cgp_rulesallowed,
+            )
+  %>
+
+  <% include('/elements/tr-checkbox.html',
+               'label'      => 'RPOP modifications',
+               'field'      => 'acct_def_cgp_rpopallowed',
+               'curr_value' => $svc_domain->acct_def_cgp_rpopallowed,
+               'value'      => 'Y',
+            )
+  %>
+
+  <% include('/elements/tr-checkbox.html',
+               'label'      => 'Accepts mail to "all"',
+               'field'      => 'acct_def_cgp_mailtoall',
+               'curr_value' => $svc_domain->acct_def_cgp_mailtoall,
+               'value'      => 'Y',
+            )
+  %>
+
+  <% include('/elements/tr-checkbox.html',
+               'label'      => 'Add trailer to sent mail',
+               'field'      => 'acct_def_cgp_addmailtrailer',
+               'curr_value' => $svc_domain->acct_def_cgp_addmailtrailer,
+               'value'      => 'Y',
+            )
+  %>
+
 %# false laziness w/svc_acct acct_def
   <TR>
     <TD ALIGN="right">Message delete method</TD>
@@ -190,6 +226,14 @@ Account defaults
             )
   %>
 
+  <% include('/elements/tr-checkbox.html',
+               'label'      =>'Password recovery',
+               'field'      => 'acct_def_password_recover',
+               'curr_value' => $svc_domain->acct_def_password_recover,
+               'value'      => 'Y',
+            )
+  %>
+
 </TABLE>
 <BR>
 
diff --git a/httemplate/view/svc_domain/acct_defaults.html b/httemplate/view/svc_domain/acct_defaults.html
index 0c072bff5..01cc282fb 100644
--- a/httemplate/view/svc_domain/acct_defaults.html
+++ b/httemplate/view/svc_domain/acct_defaults.html
@@ -3,12 +3,15 @@
   Account defaults
   <% &ntable("#cccccc") %><TR><TD><% &ntable("#cccccc",2) %>
 
+%# settings
+
   <% include('/view/elements/tr.html',
                label=>'Password modification',
                value=>$svc_domain->acct_def_password_selfchange ? 'YES' : 'NO',
             )
   %>
-   <% include('/view/elements/tr.html',
+
+  <% include('/view/elements/tr.html',
                label=>'Password recovery',
                value=>$svc_domain->acct_def_password_recover ? 'YES' : 'NO',
             )
@@ -43,7 +46,33 @@
                value=>$svc_domain->acct_def_file_maxsize,
             )
   %>
-    
+
+  <% include('/view/elements/tr.html',
+               label=>'Allowed mail rules',
+               value=>$svc_domain->acct_def_cgp_rulesallowed || 'default (No)',
+            )
+  %>
+
+  <% include('/view/elements/tr.html',
+               label=>'RPOP modifications',
+               value=>$svc_domain->acct_def_cgp_rpopallowed ? 'YES' : 'NO',
+            )
+  %>
+
+  <% include('/view/elements/tr.html',
+               label=>'Accepts mail to "all"',
+               value=>$svc_domain->acct_def_cgp_mailtoall ? 'YES' : 'NO',
+            )
+  %>
+
+  <% include('/view/elements/tr.html',
+               label=>'Add trailer to sent mail',
+               value=>$svc_domain->acct_def_cgp_addmailtrailer ? 'YES' : 'NO',
+            )
+  %>
+
+%# preferences
+
   <% include('/view/elements/tr.html',
                label=>'Message delete method',
                value=>$svc_domain->acct_def_cgp_deletemode,
@@ -68,4 +97,12 @@ my $part_svc = $opt{'part_svc'};
 my $communigate = scalar($part_svc->part_export('communigate_pro'));
                 # || scalar($part_svc->part_export('communigate_pro_singledomain'));
 
+my %rulesallowed = (
+  -1 => 'default (No)', #No always the default?
+   0 => 'No',
+   1 => 'Filter Only',
+   2 => 'All But Exec',
+   3 => 'Any',
+);
+
 </%init>