[freeside-commits] freeside/FS/FS svc_CGP_Mixin.pm, 1.1, 1.2 svc_acct.pm, 1.296, 1.297 svc_domain.pm, 1.70, 1.71

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv27249/FS/FS

Modified Files:
	svc_CGP_Mixin.pm svc_acct.pm svc_domain.pm 
Log Message:
add EmptyTrash values and finish consolidating the CGP timezone arrays, RT#7083

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -w -d -r1.296 -r1.297
--- svc_acct.pm	23 Jul 2010 09:32:59 -0000	1.296
+++ svc_acct.pm	23 Jul 2010 10:02:39 -0000	1.297
@@ -452,7 +452,8 @@
                             },
         'cgp_emptytrash' => { 
                               label => 'Communigate on logout remove trash',
-                              type  => 'text',
+                              type        => 'select',
+                              select_list => __PACKAGE__->cgp_emptytrash_values,
                               disable_inventory => 1,
                               disable_select    => 1,
                             },
@@ -466,7 +467,7 @@
         'cgp_timezone' => {
                             label             => 'Communigate time zone',
                             type              => 'select',
-                            select_list       => __PACKAGE__->cgp_timezone,
+                            select_list => __PACKAGE__->cgp_timezone_values,
                             disable_inventory => 1,
                             disable_select    => 1,
                           },
@@ -1184,7 +1185,7 @@
               || $self->ut_enum('cgp_addmailtrailer', [ '', 'Y' ])
               #preferences
               || $self->ut_alphasn('cgp_deletemode')
-              || $self->ut_alphan('cgp_emptytrash')
+              || $self->ut_enum('cgp_emptytrash', $self->cgp_emptytrash_values)
               || $self->ut_alphan('cgp_language')
               || $self->ut_textn('cgp_timezone')
               || $self->ut_textn('cgp_skinname')

Index: svc_domain.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_domain.pm,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -w -d -r1.70 -r1.71
--- svc_domain.pm	23 Jul 2010 09:32:59 -0000	1.70
+++ svc_domain.pm	23 Jul 2010 10:02:39 -0000	1.71
@@ -159,7 +159,8 @@
                           },
       'acct_def_cgp_emptytrash' => { 
                             label => 'Acct. default Communigate on logout remove trash',
-                            type  => 'text',
+                            type        => 'select',
+                            select_list => __PACKAGE__->cgp_emptytrash_values,
                             disable_inventory => 1,
                             disable_select    => 1,
                           },
@@ -222,7 +223,7 @@
       'acct_def_cgp_timezone' => {
                             label             => 'Acct. default time zone',
                             type              => 'select',
-                            select_list       => __PACKAGE__->cgp_timezone,
+                            select_list => __PACKAGE__->cgp_timezone_values,
                             disable_inventory => 1,
                             disable_select    => 1,
                         },
@@ -492,7 +493,8 @@
               #XXX archive messages
               #preferences
               || $self->ut_alphasn('acct_def_cgp_deletemode')
-              || $self->ut_alphan('acct_def_cgp_emptytrash')
+              || $self->ut_enum('acct_def_cgp_emptytrash',
+                                   $self->cgp_emptytrash_values )
               || $self->ut_alphan('acct_def_cgp_language')
               || $self->ut_textn('acct_def_cgp_timezone')
               || $self->ut_textn('acct_def_cgp_skinname')

Index: svc_CGP_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_CGP_Mixin.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- svc_CGP_Mixin.pm	23 Jul 2010 09:32:59 -0000	1.1
+++ svc_CGP_Mixin.pm	23 Jul 2010 10:02:35 -0000	1.2
@@ -30,7 +30,7 @@
 #http://www.communigate.com/pub/client/TimeZones.data 
 #http://www.communigate.com/cgatepro/WebMail.html#Settings 
 
-sub cgp_timezone {
+sub cgp_timezone_values {
   #my $self = shift; #i'm used as a class and object method but just return data
 
   [ '',
@@ -96,7 +96,39 @@
     'SouthAmerica/Chile',
     'SouthAmerica/Paraguay',
   ];
+}
+
+=item cgp_emptytrash_values
+
+Returns an arrayref of possible EmptyTrash values.
+
+=cut
 
+#http://www.communigate.com/cgatepro/WebMail.html#Trash
+
+sub cgp_emptytrash_values {
+  #my $self = shift; #i'm used as a class and object method but just return data
+
+  [ '', #<option value="-1">default(92 days)
+    '0 seconds',
+    '60 minutes',
+    '2 hours',
+    '3 hours',
+    '6 hours',
+    '12 hours',
+    '24 hours',
+    '2 days',
+    '3 days',
+    '7 days',
+    '10 days',
+    '2 weeks',
+    '3 weeks',
+    '30 days',
+    '60 days',
+    '90 days',
+    '180 days',
+    '360 days',
+  ];
 }
 
 =back