[freeside-commits] freeside/FS/FS Schema.pm, 1.168.2.18, 1.168.2.19 svc_domain.pm, 1.56.2.2, 1.56.2.3 svc_acct.pm, 1.268.2.16, 1.268.2.17

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Schema.pm svc_domain.pm svc_acct.pm 
Log Message:
communigate: domain aliases, enabled services, RT#7083

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.18
retrieving revision 1.168.2.19
diff -u -d -r1.168.2.18 -r1.168.2.19
--- Schema.pm	21 Feb 2010 09:19:07 -0000	1.168.2.18
+++ Schema.pm	22 Feb 2010 03:22:15 -0000	1.168.2.19
@@ -1533,7 +1533,10 @@
 	'setup_date',      @date_type, '', '',
 	'renewal_interval', 'int', 'NULL',       '', '', '',
 	'expiration_date', @date_type, '', '',
+        #communigate pro fields (quota = MaxAccountSize)
         'max_accounts',     'int', 'NULL',       '', '', '',
+        'cgp_aliases',  'varchar', 'NULL',      255, '', '',
+        'cgp_accessmodes','varchar','NULL',     255, '', '', #DomainAccessModes
       ],
       '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.16
retrieving revision 1.268.2.17
diff -u -d -r1.268.2.16 -r1.268.2.17
--- svc_acct.pm	21 Feb 2010 09:19:07 -0000	1.268.2.16
+++ svc_acct.pm	22 Feb 2010 03:22:15 -0000	1.268.2.17
@@ -284,6 +284,12 @@
                                disable_inventory => 1,
                                disable_select    => 1,
                              },
+        'cgp_aliases' => { 
+                           label => 'Communigate aliases',
+                           type  => 'text',
+                           disable_inventory => 1,
+                           disable_select    => 1,
+                         },
         'cgp_deletemode' => { 
                               label => 'Communigate message delete method',
                               type  => 'select',
@@ -1106,16 +1112,14 @@
               || $self->ut_snumbern('upbytes')
               || $self->ut_snumbern('downbytes')
               || $self->ut_snumbern('totalbytes')
-              || $self->ut_enum( '_password_encoding',
-                                 [ '', qw( plain crypt ldap ) ]
-                               )
-              || $self->ut_enum( 'password_selfchange', [ '', 'Y' ] )
-              || $self->ut_enum( 'password_recover',    [ '', 'Y' ] )
-              || $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' )
+              || $self->ut_enum('_password_encoding', ['',qw(plain crypt ldap)])
+              || $self->ut_enum('password_selfchange', [ '', 'Y' ])
+              || $self->ut_enum('password_recover',    [ '', 'Y' ])
+              || $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;
 

Index: svc_domain.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_domain.pm,v
retrieving revision 1.56.2.2
retrieving revision 1.56.2.3
diff -u -d -r1.56.2.2 -r1.56.2.3
--- svc_domain.pm	17 Feb 2010 08:30:36 -0000	1.56.2.2
+++ svc_domain.pm	22 Feb 2010 03:22:15 -0000	1.56.2.3
@@ -114,6 +114,18 @@
       'max_accounts' => { label => 'Maximum number of accounts',
                           'disable_inventory' => 1,
                         },
+      'cgp_aliases' => { 
+                         label => 'Communigate aliases',
+                         type  => 'text',
+                         disable_inventory => 1,
+                         disable_select    => 1,
+                       },
+      'cgp_accessmodes' => { 
+                             label => 'Communigate enabled services',
+                             type  => 'communigate_pro-accessmodes',
+                             disable_inventory => 1,
+                             disable_select    => 1,
+                           },
     },
   };
 }
@@ -342,6 +354,7 @@
   my $error = $self->ut_numbern('svcnum')
               || $self->ut_numbern('catchall')
               || $self->ut_numbern('max_accounts')
+              || $self->ut_textn('cgp_aliases') #well
   ;
   return $error if $error;