summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorivan <ivan>2010-04-19 05:01:52 +0000
committerivan <ivan>2010-04-19 05:01:52 +0000
commit20f38e4c256094bd938b732950e8f93319f851a5 (patch)
tree35a3ee60e54628c81853dfdf5197237ce94c8856 /FS
parentad7f49821d40ffd099a45acc32ba91e0e211aede (diff)
communigate provisioning phase 2: Domain:Account Defaults:Settings: RulesAllowed, RPOPAllowed, MailToAll, AddMailTrailer. RT#7514
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/Schema.pm5
-rw-r--r--FS/FS/part_export/communigate_pro.pm8
-rw-r--r--FS/FS/svc_domain.pm4
3 files changed, 17 insertions, 0 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 082a03d..d73b282 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1727,6 +1727,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 37cc6ef..9ea8401 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 5adbef5..f8c6615 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;