[freeside-commits] freeside/FS/FS Schema.pm, 1.168.2.44, 1.168.2.45 svc_acct.pm, 1.268.2.29, 1.268.2.30 svc_domain.pm, 1.56.2.15, 1.56.2.16
Ivan,,,
ivan at wavetail.420.am
Fri Aug 6 14:28:05 PDT 2010
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv23744/FS/FS
Modified Files:
Tag: FREESIDE_1_9_BRANCH
Schema.pm svc_acct.pm svc_domain.pm
Log Message:
communigate phase 3: archive messages, RT#7515
Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.44
retrieving revision 1.168.2.45
diff -u -w -d -r1.168.2.44 -r1.168.2.45
--- Schema.pm 30 Jul 2010 00:06:54 -0000 1.168.2.44
+++ Schema.pm 6 Aug 2010 21:28:02 -0000 1.168.2.45
@@ -1533,7 +1533,8 @@
'cgp_rpopallowed', 'char', 'NULL', 1, '', '', #RPOPAllowed
'cgp_mailtoall', 'char', 'NULL', 1, '', '', #MailToAll
'cgp_addmailtrailer', 'char', 'NULL', 1, '', '', #AddMailTrailer
- #XXX archive messages, mailing lists
+ 'cgp_archiveafter', 'int', 'NULL', '', '', '', #ArchiveMessagesAfter
+ #XXX mailing lists
#preferences
'cgp_deletemode', 'varchar', 'NULL', $char_d, '', '',#DeleteMode
'cgp_emptytrash', 'varchar', 'NULL', $char_d, '', '',#EmptyTrash
@@ -1543,7 +1544,6 @@
'cgp_prontoskinname', 'varchar', 'NULL', $char_d, '', '',#ProntoSkinName
'cgp_sendmdnmode', 'varchar', 'NULL', $char_d, '', '',#SendMDNMode
#mail
-#vacation message, redirect all mail, mail rules
#XXX RPOP settings
],
'primary_key' => 'svcnum',
@@ -1605,7 +1605,7 @@
'acct_def_cgp_rpopallowed', 'char', 'NULL', 1, '', '',
'acct_def_cgp_mailtoall', 'char', 'NULL', 1, '', '',
'acct_def_cgp_addmailtrailer', 'char', 'NULL', 1, '', '',
- #XXX archive messages
+ 'acct_def_cgp_archiveafter', 'int', 'NULL', '', '', '',
#preferences
'acct_def_cgp_deletemode', 'varchar', 'NULL', $char_d, '', '',
'acct_def_cgp_emptytrash', 'varchar', 'NULL', $char_d, '', '',
@@ -1614,8 +1614,6 @@
'acct_def_cgp_skinname', 'varchar', 'NULL', $char_d, '', '',
'acct_def_cgp_prontoskinname', 'varchar', 'NULL', $char_d, '', '',
'acct_def_cgp_sendmdnmode', 'varchar', 'NULL', $char_d, '', '',
- #mail
- #XXX rules, archive rule, spam foldering rule(s)
],
'primary_key' => 'svcnum',
'unique' => [ ],
Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.268.2.29
retrieving revision 1.268.2.30
diff -u -w -d -r1.268.2.29 -r1.268.2.30
--- svc_acct.pm 28 Jul 2010 23:20:58 -0000 1.268.2.29
+++ svc_acct.pm 6 Aug 2010 21:28:03 -0000 1.268.2.30
@@ -440,7 +440,28 @@
'cgp_addmailtrailer' => { label => 'Add trailer to sent mail',
type => 'checkbox',
},
- #XXX archive messages, mailing lists
+ 'cgp_archiveafter' => {
+ label => 'Archive messages after',
+ type => 'select',
+ select_hash => [
+ -2 => 'default(730 day(s))',
+ 0 => 'Never',
+ 86400 => '24 hour(s)',
+ 172800 => '2 day(s)',
+ 259200 => '3 day(s)',
+ 432000 => '5 day(s)',
+ 604800 => '7 day(s)',
+ 1209600 => '2 week(s)',
+ 2592000 => '30 day(s)',
+ 7776000 => '90 day(s)',
+ 15552000 => '180 day(s)',
+ 31536000 => '365 day(s)',
+ 63072000 => '730 day(s)',
+ ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ #XXX mailing lists
#preferences
'cgp_deletemode' => {
@@ -494,7 +515,6 @@
},
#mail
- #XXX vacation message, redirect all mail, mail rules
#XXX RPOP settings
},
@@ -1190,6 +1210,7 @@
|| $self->ut_enum('cgp_rpopallowed', [ '', 'Y' ])
|| $self->ut_enum('cgp_mailtoall', [ '', 'Y' ])
|| $self->ut_enum('cgp_addmailtrailer', [ '', 'Y' ])
+ || $self->ut_snumbern('cgp_archiveafter')
#preferences
|| $self->ut_alphasn('cgp_deletemode')
|| $self->ut_enum('cgp_emptytrash', $self->cgp_emptytrash_values)
@@ -1198,7 +1219,6 @@
|| $self->ut_textn('cgp_skinname')
|| $self->ut_textn('cgp_prontoskinname')
|| $self->ut_alphan('cgp_sendmdnmode')
- #XXX vacation message, redirect all mail, mail rules
#XXX RPOP settings
;
return $error if $error;
Index: svc_domain.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_domain.pm,v
retrieving revision 1.56.2.15
retrieving revision 1.56.2.16
diff -u -w -d -r1.56.2.15 -r1.56.2.16
--- svc_domain.pm 23 Jul 2010 10:03:05 -0000 1.56.2.15
+++ svc_domain.pm 6 Aug 2010 21:28:03 -0000 1.56.2.16
@@ -207,6 +207,27 @@
label => 'Acct. default Add trailer to sent mail',
type => 'checkbox',
},
+ 'acct_def_cgp_archiveafter' => {
+ label => 'Archive messages after',
+ type => 'select',
+ select_hash => [
+ -2 => 'default(730 days)',
+ 0 => 'Never',
+ 86400 => '24 hours',
+ 172800 => '2 days',
+ 259200 => '3 days',
+ 432000 => '5 days',
+ 604800 => '7 days',
+ 1209600 => '2 weeks',
+ 2592000 => '30 days',
+ 7776000 => '90 days',
+ 15552000 => '180 days',
+ 31536000 => '365 days',
+ 63072000 => '730 days',
+ ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
'trailer' => {
label => 'Mail trailer',
type => 'textarea',
@@ -490,7 +511,7 @@
|| $self->ut_enum('acct_def_cgp_rpopallowed', [ '', 'Y' ])
|| $self->ut_enum('acct_def_cgp_mailtoall', [ '', 'Y' ])
|| $self->ut_enum('acct_def_cgp_addmailtrailer', [ '', 'Y' ])
- #XXX archive messages
+ || $self->ut_snumbern('acct_def_cgp_archiveafter')
#preferences
|| $self->ut_alphasn('acct_def_cgp_deletemode')
|| $self->ut_enum('acct_def_cgp_emptytrash',
@@ -501,7 +522,6 @@
|| $self->ut_textn('acct_def_cgp_prontoskinname')
|| $self->ut_alphan('acct_def_cgp_sendmdnmode')
#mail
- #XXX rules, archive rule, spam foldering rule(s)
;
return $error if $error;
More information about the freeside-commits
mailing list