[freeside-commits] freeside/FS/FS/part_export communigate_pro.pm, 1.29, 1.30

[Ivan,,,]

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

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

Index: communigate_pro.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/communigate_pro.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -d -r1.29 -r1.30
--- communigate_pro.pm	19 Apr 2010 06:15:58 -0000	1.29
+++ communigate_pro.pm	19 Apr 2010 07:09:16 -0000	1.30
@@ -78,7 +78,8 @@
     'RealName'       => $svc_acct->finger,
     'Password'       => $svc_acct->_password,
 
-    #phase 2: allowed mail rules, RPOP modifications, accepts mail to all, add trailer to sent mail
+    'PasswordRecovery' => ($svc_acct->password_recover ? 'YES':'NO'),
+
     'RulesAllowed'     => $svc_acct->cgp_rulesallowed,
     'RPOPAllowed'      =>($svc_acct->cgp_rpopallowed    ?'YES':'NO'),
     'MailToAll'        =>($svc_acct->cgp_mailtoall      ?'YES':'NO'),
@@ -87,7 +88,6 @@
     map { $quotas{$_} => $svc_acct->$_() }
         grep $svc_acct->$_(), keys %quotas
   );
-  #XXX phase 2: pwdallowed, passwordrecovery
   #XXX phase 3: archive messages, mailing lists
 
   my @options = ( 'CreateAccount',
@@ -280,17 +280,18 @@
     if $old->cgp_accessmodes ne $new->cgp_accessmodes
     || $old->cgp_type ne $new->cgp_type;
 
-  #phase 2: allowed mail rules, RPOP modifications, accepts mail to all, add trailer to sent mail
+  $settings{'PasswordRecovery'} = ( $new->password_recover ? 'YES':'NO' )
+    if $old->password_recover ne $new->password_recover;
+
   $settings{'RulesAllowed'} = $new->cgp_rulesallowed
     if $old->cgp_rulesallowed ne $new->cgp_rulesallowed;
-  $settings{'RPOPAllowed'} = $new->cgp_rpopallowed
+  $settings{'RPOPAllowed'} = ( $new->cgp_rpopallowed ? 'YES':'NO' )
     if $old->cgp_rpopallowed ne $new->cgp_rpopallowed;
-  $settings{'MailToAll'} = $new->cgp_mailtoall
+  $settings{'MailToAll'} = ( $new->cgp_mailtoall ? 'YES':'NO' )
     if $old->cgp_mailtoall ne $new->cgp_mailtoall;
-  $settings{'AddMailTrailer'} = $new->cgp_addmailtrailer
+  $settings{'AddMailTrailer'} = ( $new->cgp_addmailtrailer ? 'YES':'NO' )
     if $old->cgp_addmailtrailer ne $new->cgp_addmailtrailer;
 
-  #XXX phase 2: pwdallowed, passwordrecovery
   #XXX phase 3: archive messages, mailing lists
 
   if ( keys %settings ) {