[freeside-commits] freeside/FS/FS Schema.pm, 1.168.2.17, 1.168.2.18 svc_acct.pm, 1.268.2.15, 1.268.2.16

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Schema.pm svc_acct.pm 
Log Message:
communigate, RT#7083

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.17
retrieving revision 1.168.2.18
diff -u -d -r1.168.2.17 -r1.168.2.18
--- Schema.pm	21 Feb 2010 07:28:12 -0000	1.168.2.17
+++ Schema.pm	21 Feb 2010 09:19:07 -0000	1.168.2.18
@@ -1487,7 +1487,9 @@
         'password_selfchange','char', 'NULL',       1, '', '', 
         'password_recover',   'char', 'NULL',       1, '', '', 
         'cgp_type',        'varchar', 'NULL', $char_d, '', '', #AccountType
-        'cgp_aliases',     'varchar', 'NULL',     255, '', '', #AccountType
+        'cgp_aliases',     'varchar', 'NULL',     255, '', '',
+        'cgp_deletemode',  'varchar', 'NULL', $char_d, '', '', #DeleteMode
+        'cgp_emptytrash',  'varchar', 'NULL', $char_d, '', '', #EmptyTrash
       ],
       'primary_key' => 'svcnum',
       #'unique' => [ [ 'username', 'domsvc' ] ],

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.268.2.15
retrieving revision 1.268.2.16
diff -u -d -r1.268.2.15 -r1.268.2.16
--- svc_acct.pm	21 Feb 2010 07:28:12 -0000	1.268.2.15
+++ svc_acct.pm	21 Feb 2010 09:19:07 -0000	1.268.2.16
@@ -274,7 +274,7 @@
         'cgp_type'=> { 
                        label => 'Communigate account type',
                        type => 'select',
-                       select_list => [ ],
+                       select_list => [qw( MultiMailbox TextMailbox MailDirMailbox AGrade BGrade CGrade )],
                        disable_inventory => 1,
                        disable_select    => 1,
                      },
@@ -284,6 +284,19 @@
                                disable_inventory => 1,
                                disable_select    => 1,
                              },
+        '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',
@@ -1101,6 +1114,8 @@
               || $self->ut_textn( 'cgp_accessmodes' )
               || $self->ut_alphan( 'cgp_type' )
               || $self->ut_textn( 'cgp_aliases' ) #well
+              || $self->ut_alphasn( 'cgp_deletemode' )
+              || $self->ut_alphan( 'cgp_emptytrash' )
   ;
   return $error if $error;