[freeside-commits] freeside/FS/FS svc_acct.pm, 1.268.2.20, 1.268.2.21 Schema.pm, 1.168.2.31, 1.168.2.32

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	svc_acct.pm Schema.pm 
Log Message:
communigate (phase 2), Account:Settings PasswordRecovery.  also fix modification of svc_acct booleans in export.  RT#7514

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.31
retrieving revision 1.168.2.32
diff -u -w -d -r1.168.2.31 -r1.168.2.32
--- Schema.pm	19 Apr 2010 06:16:00 -0000	1.168.2.31
+++ Schema.pm	19 Apr 2010 07:09:18 -0000	1.168.2.32
@@ -1500,7 +1500,7 @@
         'file_maxsize',    'varchar', 'NULL', $char_d, '', '', #MaxFileSize
         'cgp_accessmodes', 'varchar', 'NULL',     255, '', '', #AccessModes
         'password_selfchange','char', 'NULL',       1, '', '', #PWDAllowed
-        'password_recover',   'char', 'NULL',       1, '', '', #PasswordRecovery
+        '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
@@ -1558,7 +1558,7 @@
         'cgp_aliases',  'varchar', 'NULL',      255, '', '',
         'cgp_accessmodes','varchar','NULL',     255, '', '', #DomainAccessModes
         'acct_def_password_selfchange','char', 'NULL',       1, '', '', 
-        'acct_def_password_recover',   'char', 'NULL',       1, '', '', 
+        'acct_def_password_recover',   'char', 'NULL',       1, 'Y', '', 
         'acct_def_cgp_accessmodes', 'varchar', 'NULL',     255, '', '',
         'acct_def_quota',           'varchar', 'NULL', $char_d, '', '',
         'acct_def_file_quota',      'varchar', 'NULL', $char_d, '', '',

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.268.2.20
retrieving revision 1.268.2.21
diff -u -w -d -r1.268.2.20 -r1.268.2.21
--- svc_acct.pm	19 Apr 2010 06:16:00 -0000	1.268.2.20
+++ svc_acct.pm	19 Apr 2010 07:09:17 -0000	1.268.2.21
@@ -1111,12 +1111,14 @@
               || $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')
+              #settings
               || $self->ut_alphasn('cgp_rulesallowed')
               || $self->ut_enum('cgp_rpopallowed', [ '', 'Y' ])
               || $self->ut_enum('cgp_mailtoall', [ '', 'Y' ])
               || $self->ut_enum('cgp_addmailtrailer', [ '', 'Y' ])
+              #preferences
+              || $self->ut_alphasn('cgp_deletemode')
+              || $self->ut_alphan('cgp_emptytrash')
   ;
   return $error if $error;