[freeside-commits] freeside/FS/FS svc_acct.pm, 1.268.2.21, 1.268.2.22 svc_domain.pm, 1.56.2.9, 1.56.2.10 Schema.pm, 1.168.2.32, 1.168.2.33
Ivan,,,
ivan at wavetail.420.am
Mon Apr 19 18:51:57 PDT 2010
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv26725/FS/FS
Modified Files:
Tag: FREESIDE_1_9_BRANCH
svc_acct.pm svc_domain.pm Schema.pm
Log Message:
communigate (phase 2): Account Preferences (& Domain::Account Defaults:Preferences): Language, Time zone, Layout, Send read receipts. RT#7514
Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.32
retrieving revision 1.168.2.33
diff -u -w -d -r1.168.2.32 -r1.168.2.33
--- Schema.pm 19 Apr 2010 07:09:18 -0000 1.168.2.32
+++ Schema.pm 20 Apr 2010 01:51:54 -0000 1.168.2.33
@@ -1495,20 +1495,31 @@
'last_login', @date_type, '', '',
'last_logout', @date_type, '', '',
#communigate pro fields (quota = MaxAccountSize)
+ 'cgp_aliases', 'varchar', 'NULL', 255, '', '',
+ #settings
+ 'cgp_type', 'varchar', 'NULL', $char_d, '', '', #AccountType
'file_quota', 'varchar', 'NULL', $char_d, '', '', #MaxWebSize
'file_maxnum', 'varchar', 'NULL', $char_d, '', '', #MaxWebFiles
'file_maxsize', 'varchar', 'NULL', $char_d, '', '', #MaxFileSize
'cgp_accessmodes', 'varchar', 'NULL', 255, '', '', #AccessModes
'password_selfchange','char', 'NULL', 1, '', '', #PWDAllowed
'password_recover', 'char', 'NULL', 1, 'Y','', #PasswordRecovery
- 'cgp_type', 'varchar', 'NULL', $char_d, '', '', #AccountType
- 'cgp_aliases', 'varchar', 'NULL', 255, '', '',
- 'cgp_deletemode', 'varchar', 'NULL', $char_d, '', '', #DeleteMode
- 'cgp_emptytrash', 'varchar', 'NULL', $char_d, '', '', #EmptyTrash
'cgp_rulesallowed','varchar', 'NULL', $char_d, '', '', #RulesAllowed
'cgp_rpopallowed', 'char', 'NULL', 1, '', '', #RPOPAllowed
'cgp_mailtoall', 'char', 'NULL', 1, '', '', #MailToAll
'cgp_addmailtrailer', 'char', 'NULL', 1, '', '', #AddMailTrailer
+ #XXX archive messages, mailing lists
+ #preferences
+ 'cgp_deletemode', 'varchar', 'NULL', $char_d, '', '', #DeleteMode
+ 'cgp_emptytrash', 'varchar', 'NULL', $char_d, '', '', #EmptyTrash
+ 'cgp_language', 'varchar', 'NULL', $char_d, '', '', #Language
+ 'cgp_timezone', 'varchar', 'NULL', $char_d, '', '', #TimeZone
+ 'cgp_skinname', 'varchar', 'NULL', $char_d, '', '', #SkinName
+ #XXX pronto style?
+ 'cgp_sendmdnmode', 'varchar', 'NULL', $char_d, '', '', #SendMDNMode
+ #mail
+#vacation message, redirect all mail, mail rules
+ #XXX RPOP settings
],
'primary_key' => 'svcnum',
#'unique' => [ [ 'username', 'domsvc' ] ],
@@ -1557,6 +1568,7 @@
'trailer', 'text', 'NULL', '', '', '',
'cgp_aliases', 'varchar', 'NULL', 255, '', '',
'cgp_accessmodes','varchar','NULL', 255, '', '', #DomainAccessModes
+ #settings
'acct_def_password_selfchange','char', 'NULL', 1, '', '',
'acct_def_password_recover', 'char', 'NULL', 1, 'Y', '',
'acct_def_cgp_accessmodes', 'varchar', 'NULL', 255, '', '',
@@ -1564,13 +1576,21 @@
'acct_def_file_quota', 'varchar', 'NULL', $char_d, '', '',
'acct_def_file_maxnum', 'varchar', 'NULL', $char_d, '', '',
'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, '', '',
-
+ #XXX archive messages
+ #preferences
+ 'acct_def_cgp_deletemode', 'varchar', 'NULL', $char_d, '', '',
+ 'acct_def_cgp_emptytrash', 'varchar', 'NULL', $char_d, '', '',
+ 'acct_def_cgp_language', 'varchar', 'NULL', $char_d, '', '',
+ 'acct_def_cgp_timezone', 'varchar', 'NULL', $char_d, '', '',
+ 'acct_def_cgp_skinname', 'varchar', 'NULL', $char_d, '', '',
+ #XXX pronto style?
+ '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.21
retrieving revision 1.268.2.22
diff -u -w -d -r1.268.2.21 -r1.268.2.22
--- svc_acct.pm 19 Apr 2010 07:09:17 -0000 1.268.2.21
+++ svc_acct.pm 20 Apr 2010 01:51:54 -0000 1.268.2.22
@@ -268,44 +268,12 @@
disable_fixed => 1,
disable_select => 1,
},
- 'cgp_type'=> {
- label => 'Communigate account type',
- type => 'select',
- select_list => [qw( MultiMailbox TextMailbox MailDirMailbox AGrade BGrade CGrade )],
- disable_inventory => 1,
- disable_select => 1,
- },
- 'cgp_accessmodes' => {
- label => 'Communigate enabled services',
- type => 'communigate_pro-accessmodes',
- disable_inventory => 1,
- disable_select => 1,
- },
- 'cgp_aliases' => {
- label => 'Communigate aliases',
- type => 'text',
- disable_inventory => 1,
- disable_select => 1,
- },
'password_selfchange' => { label => 'Password modification',
type => 'checkbox',
},
'password_recover' => { label => 'Password recovery',
type => 'checkbox',
},
- 'cgp_deletemode' => {
- label => 'Communigate message delete method',
- type => 'select',
- select_list => [ 'Move To Trash', 'Immediately', 'Mark' ],
- disable_inventory => 1,
- disable_select => 1,
- },
- 'cgp_emptytrash' => {
- label => 'Communigate on logout remove trash',
- type => 'text',
- disable_inventory => 1,
- disable_select => 1,
- },
'quota' => {
label => 'Quota', #Mail storage limit
type => 'text',
@@ -434,6 +402,155 @@
label => 'Last logout',
type => 'disabled',
},
+
+ 'cgp_aliases' => {
+ label => 'Communigate aliases',
+ type => 'text',
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ #settings
+ 'cgp_type'=> {
+ label => 'Communigate account type',
+ type => 'select',
+ select_list => [qw( MultiMailbox TextMailbox MailDirMailbox AGrade BGrade CGrade )],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'cgp_accessmodes' => {
+ label => 'Communigate enabled services',
+ type => 'communigate_pro-accessmodes',
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'cgp_rulesallowed' => {
+ label => 'Allowed mail rules',
+ type => 'select',
+ select_list => [ '', 'No', 'Filter Only', 'All But Exec', 'Any' ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'cgp_rpopallowed' => { label => 'RPOP modifications',
+ type => 'checkbox',
+ },
+ 'cgp_mailtoall' => { label => 'Accepts mail to "all"',
+ type => 'checkbox',
+ },
+ 'cgp_addmailtrailer' => { label => 'Add trailer to sent mail',
+ type => 'checkbox',
+ },
+ #XXX archive messages, mailing lists
+
+ #preferences
+ 'cgp_deletemode' => {
+ label => 'Communigate message delete method',
+ type => 'select',
+ select_list => [ 'Move To Trash', 'Immediately', 'Mark' ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'cgp_emptytrash' => {
+ label => 'Communigate on logout remove trash',
+ type => 'text',
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'cgp_language' => {
+ label => 'Communigate language',
+ type => 'select',
+ select_list => [ '', qw( English Arabic Chinese Dutch French German Hebrew Italian Japanese Portuguese Russian Slovak Spanish Thai ) ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'cgp_timezone' => {
+ label => 'Communigate time zone',
+ type => 'select',
+ select_list => [ '',
+ 'HostOS',
+ '(+0100) Algeria/Congo',
+ '(+0200) Egypt/South Africa',
+ '(+0300) Saudi Arabia',
+ '(+0400) Oman',
+ '(+0500) Pakistan',
+ '(+0600) Bangladesh',
+ '(+0700) Thailand/Vietnam',
+ '(+0800) China/Malaysia',
+ '(+0900) Japan/Korea',
+ '(+1000) Queensland',
+ '(+1100) Micronesia',
+ '(+1200) Fiji',
+ '(+1300) Tonga/Kiribati',
+ '(+1400) Christmas Islands',
+ '(-0100) Azores/Cape Verde',
+ '(-0200) Fernando de Noronha',
+ '(-0300) Argentina/Uruguay',
+ '(-0400) Venezuela/Guyana',
+ '(-0500) Haiti/Peru',
+ '(-0600) Central America',
+ '(-0700) Arisona',
+ '(-0800) Adamstown',
+ '(-0900) Marquesas Islands',
+ '(-1000) Hawaii/Tahiti',
+ '(-1100) Samoa',
+ 'Asia/Afghanistan',
+ 'Asia/India',
+ 'Asia/Iran',
+ 'Asia/Iraq',
+ 'Asia/Israel',
+ 'Asia/Jordan',
+ 'Asia/Lebanon',
+ 'Asia/Syria',
+ 'Australia/Adelaide',
+ 'Australia/East',
+ 'Australia/NorthernTerritory',
+ 'Europe/Central',
+ 'Europe/Eastern',
+ 'Europe/Moscow',
+ 'Europe/Western',
+ 'GMT (+0000)',
+ 'Newfoundland',
+ 'NewZealand/Auckland',
+ 'NorthAmerica/Alaska',
+ 'NorthAmerica/Atlantic',
+ 'NorthAmerica/Central',
+ 'NorthAmerica/Eastern',
+ 'NorthAmerica/Mountain',
+ 'NorthAmerica/Pacific',
+ 'Russia/Ekaterinburg',
+ 'Russia/Irkutsk',
+ 'Russia/Kamchatka',
+ 'Russia/Krasnoyarsk',
+ 'Russia/Magadan',
+ 'Russia/Novosibirsk',
+ 'Russia/Vladivostok',
+ 'Russia/Yakutsk',
+ 'SouthAmerica/Brasil',
+ 'SouthAmerica/Chile',
+ 'SouthAmerica/Paraguay',
+ ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'cgp_skinname' => {
+ label => 'Communigate layout',
+ type => 'select',
+ select_list => [ '', '***', 'GoldFleece', 'Skin2' ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ #XXX pronto style?
+ 'cgp_sendmdnmode' => {
+ label => 'Communigate send read receipts',
+ type => 'select',
+ select_list => [ '', 'Never', 'Manually', 'Automatically' ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+
+ #mail
+ #XXX vacation message, redirect all mail, mail rules
+ #XXX RPOP settings
+
},
};
}
@@ -1119,6 +1236,13 @@
#preferences
|| $self->ut_alphasn('cgp_deletemode')
|| $self->ut_alphan('cgp_emptytrash')
+ || $self->ut_alphan('cgp_language')
+ || $self->ut_textn('cgp_timezone')
+ || $self->ut_textn('cgp_skinname')
+ #XXX pronto style?
+ || $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.9
retrieving revision 1.56.2.10
diff -u -w -d -r1.56.2.9 -r1.56.2.10
--- svc_domain.pm 19 Apr 2010 06:16:01 -0000 1.56.2.9
+++ svc_domain.pm 20 Apr 2010 01:51:54 -0000 1.56.2.10
@@ -189,8 +189,120 @@
disable_inventory => 1,
disable_select => 1,
},
-
-
+ 'acct_def_cgp_rulesallowed' => {
+ label => 'Acct. default Allowed mail rules',
+ type => 'select',
+ select_list => [ '', 'No', 'Filter Only', 'All But Exec', 'Any' ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'acct_def_cgp_rpopallowed' => {
+ label => 'Acct. default RPOP modifications',
+ type => 'checkbox',
+ },
+ 'acct_def_cgp_mailtoall' => {
+ label => 'Acct. default Accepts mail to "all"',
+ type => 'checkbox',
+ },
+ 'acct_def_cgp_addmailtrailer' => {
+ label => 'Acct. default Add trailer to sent mail',
+ type => 'checkbox',
+ },
+ 'trailer' => {
+ label => 'Mail trailer',
+ type => 'textarea',
+ },
+ 'acct_def_cgp_language' => {
+ label => 'Acct. default language',
+ type => 'select',
+ select_list => [ '', qw( English Arabic Chinese Dutch French German Hebrew Italian Japanese Portuguese Russian Slovak Spanish Thai ) ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'acct_def_cgp_timezone' => {
+ label => 'Acct. default time zone',
+ type => 'select',
+ select_list => [ '',
+ 'HostOS',
+ '(+0100) Algeria/Congo',
+ '(+0200) Egypt/South Africa',
+ '(+0300) Saudi Arabia',
+ '(+0400) Oman',
+ '(+0500) Pakistan',
+ '(+0600) Bangladesh',
+ '(+0700) Thailand/Vietnam',
+ '(+0800) China/Malaysia',
+ '(+0900) Japan/Korea',
+ '(+1000) Queensland',
+ '(+1100) Micronesia',
+ '(+1200) Fiji',
+ '(+1300) Tonga/Kiribati',
+ '(+1400) Christmas Islands',
+ '(-0100) Azores/Cape Verde',
+ '(-0200) Fernando de Noronha',
+ '(-0300) Argentina/Uruguay',
+ '(-0400) Venezuela/Guyana',
+ '(-0500) Haiti/Peru',
+ '(-0600) Central America',
+ '(-0700) Arisona',
+ '(-0800) Adamstown',
+ '(-0900) Marquesas Islands',
+ '(-1000) Hawaii/Tahiti',
+ '(-1100) Samoa',
+ 'Asia/Afghanistan',
+ 'Asia/India',
+ 'Asia/Iran',
+ 'Asia/Iraq',
+ 'Asia/Israel',
+ 'Asia/Jordan',
+ 'Asia/Lebanon',
+ 'Asia/Syria',
+ 'Australia/Adelaide',
+ 'Australia/East',
+ 'Australia/NorthernTerritory',
+ 'Europe/Central',
+ 'Europe/Eastern',
+ 'Europe/Moscow',
+ 'Europe/Western',
+ 'GMT (+0000)',
+ 'Newfoundland',
+ 'NewZealand/Auckland',
+ 'NorthAmerica/Alaska',
+ 'NorthAmerica/Atlantic',
+ 'NorthAmerica/Central',
+ 'NorthAmerica/Eastern',
+ 'NorthAmerica/Mountain',
+ 'NorthAmerica/Pacific',
+ 'Russia/Ekaterinburg',
+ 'Russia/Irkutsk',
+ 'Russia/Kamchatka',
+ 'Russia/Krasnoyarsk',
+ 'Russia/Magadan',
+ 'Russia/Novosibirsk',
+ 'Russia/Vladivostok',
+ 'Russia/Yakutsk',
+ 'SouthAmerica/Brasil',
+ 'SouthAmerica/Chile',
+ 'SouthAmerica/Paraguay',
+ ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ 'acct_def_cgp_skinname' => {
+ label => 'Acct. default layout',
+ type => 'select',
+ select_list => [ '', '***', 'GoldFleece', 'Skin2' ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
+ #XXX pronto style?
+ 'acct_def_cgp_sendmdnmode' => {
+ label => 'Acct. default send read receipts',
+ type => 'select',
+ select_list => [ '', 'Never', 'Manually', 'Automatically' ],
+ disable_inventory => 1,
+ disable_select => 1,
+ },
},
};
}
@@ -428,12 +540,22 @@
|| $self->ut_alphan('acct_def_file_quota')
|| $self->ut_alphan('acct_def_maxnum')
|| $self->ut_alphan('acct_def_maxsize')
- || $self->ut_alphasn('acct_def_cgp_deletemode')
- || $self->ut_alphan('acct_def_cgp_emptytrash')
+ #settings
|| $self->ut_alphasn('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' ])
+ #XXX archive messages
+ #preferences
+ || $self->ut_alphasn('acct_def_cgp_deletemode')
+ || $self->ut_alphan('acct_def_cgp_emptytrash')
+ || $self->ut_alphan('acct_def_cgp_language')
+ || $self->ut_textn('acct_def_cgp_timezone')
+ || $self->ut_textn('acct_def_cgp_skinname')
+ #XXX pronto style?
+ || $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