[freeside-commits] freeside/FS/FS svc_CGP_Mixin.pm, NONE, 1.1 svc_CGPRule_Mixin.pm, 1.1, 1.2 svc_acct.pm, 1.295, 1.296 svc_domain.pm, 1.69, 1.70
Ivan,,,
ivan at wavetail.420.am
Fri Jul 23 02:33:01 PDT 2010
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv24660/FS/FS
Modified Files:
svc_CGPRule_Mixin.pm svc_acct.pm svc_domain.pm
Added Files:
svc_CGP_Mixin.pm
Log Message:
consolidate four CGP timezone arrays, RT#7083
Index: svc_CGPRule_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_CGPRule_Mixin.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- svc_CGPRule_Mixin.pm 23 May 2010 01:59:18 -0000 1.1
+++ svc_CGPRule_Mixin.pm 23 Jul 2010 09:32:59 -0000 1.2
@@ -22,7 +22,7 @@
=over 4
-=item
+=item cgp_rule
Returns the rules associated with this service, as FS::cgp_rule objects.
Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -w -d -r1.295 -r1.296
--- svc_acct.pm 17 Jun 2010 17:50:16 -0000 1.295
+++ svc_acct.pm 23 Jul 2010 09:32:59 -0000 1.296
@@ -1,7 +1,8 @@
package FS::svc_acct;
use strict;
-use base qw( FS::svc_Domain_Mixin FS::svc_CGPRule_Mixin FS::svc_Common );
+use base qw( FS::svc_Domain_Mixin FS::svc_CGP_Mixin FS::svc_CGPRule_Mixin
+ FS::svc_Common );
use vars qw( $DEBUG $me $conf $skip_fuzzyfiles
$dir_prefix @shells $usernamemin
$usernamemax $passwordmin $passwordmax
@@ -465,69 +466,7 @@
'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',
- ],
+ select_list => __PACKAGE__->cgp_timezone,
disable_inventory => 1,
disable_select => 1,
},
Index: svc_domain.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_domain.pm,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -w -d -r1.69 -r1.70
--- svc_domain.pm 23 May 2010 01:59:18 -0000 1.69
+++ svc_domain.pm 23 Jul 2010 09:32:59 -0000 1.70
@@ -1,7 +1,8 @@
package FS::svc_domain;
use strict;
-use base qw( FS::svc_Parent_Mixin FS::svc_CGPRule_Mixin FS::svc_Common );
+use base qw( FS::svc_Parent_Mixin FS::svc_CGP_Mixin FS::svc_CGPRule_Mixin
+ FS::svc_Common );
use vars qw( $whois_hack $conf
@defaultrecords $soadefaultttl $soaemail $soaexpire $soamachine
$soarefresh $soaretry
@@ -221,69 +222,7 @@
'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',
- ],
+ select_list => __PACKAGE__->cgp_timezone,
disable_inventory => 1,
disable_select => 1,
},
--- NEW FILE: svc_CGP_Mixin.pm ---
package FS::svc_CGP_Mixin;
use strict;
=head1 NAME
FS::svc_CGP_Mixin - Mixin class for svc_classes which can be related to cgp_rule
=head1 SYNOPSIS
package FS::svc_table;
use base qw( FS::svc_CGP_Mixin FS::svc_Common );
=head1 DESCRIPTION
This is a mixin class for svc_ classes that are exported to Communigate Pro.
It currently contains timezone data for domains and accounts.
=head1 METHODS
=over 4
=item cgp_timezone
Returns an arrayref of Communigate time zones.
=cut
#http://www.communigate.com/pub/client/TimeZones.data
#http://www.communigate.com/cgatepro/WebMail.html#Settings
sub cgp_timezone {
#my $self = shift; #i'm used as a class and object method but just return data
[ '',
'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', #Arizona?
'(-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',
];
}
=back
=head1 BUGS
=head1 SEE ALSO
=cut
1;
More information about the freeside-commits
mailing list