fix subroutine call from UpdateAccountSettings sub

[freeside.git] / FS / FS / part_export / communigate_pro.pm

diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm
index 97c946a..4240618 100644 (file)
--- a/FS/FS/part_export/communigate_pro.pm
+++ b/FS/FS/part_export/communigate_pro.pm
@@ -10,14 +10,18 @@ sub rebless { shift; }
 
 sub _export_insert {
   my( $self, $svc_acct ) = (shift, shift);
-  $self->communigate_pro_queue( $svc_acct->svcnum, 'CreateAccount',
+  my @options = ( $svc_acct->svcnum, 'CreateAccount',
     'accountName'    => $svc_acct->email,
     'accountType'    => $self->option('accountType'),
-    'externalFlag'   => $self->option('externalFlag'),
     'AccessModes'    => $self->option('AccessModes'),
     'RealName'       => $svc_acct->finger,
-    'MaxAccountSize' => $svc_acct->quota,
+    'Password'       => $svc_acct->_password,
   );
+  push @options, 'MaxAccountSize' => $svc_acct->quota if $svc_acct->quota;
+  push @options, 'externalFlag'   => $self->option('externalFlag')
+    if $self->option('externalFlag');
+
+  $self->communigate_pro_queue( @options );
 }
 
 sub _export_replace {
@@ -35,6 +39,8 @@ sub _export_replace {
                 || $old->finger ne $new->finger
                 || $old->quota ne $new->quota;
 
+  return '' if '*SUSPENDED* '. $old->_password eq $new->_password;
+
   #my $err_or_queue = $self->communigate_pro_queue( $new->svcnum,'RenameAccount',
   #  $old->email, $new->email );
   #return $err_or_queue unless ref($err_or_queue);
@@ -53,16 +59,27 @@ sub _export_delete {
   );
 }
 
-#sub _export_suspend {
-#}
+sub _export_suspend {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->communigate_pro_queue( $svc_acct->svcnum, 'UpdateAccountSettings',
+    'accountName' => $svc_acct->email,
+    'AccessModes' => 'Mail',
+  );
+}
 
-#sub _export_unsuspend {
-#}
+sub _export_unsuspend {
+  my( $self, $svc_acct ) = (shift, shift);
+  $self->communigate_pro_queue( $svc_acct->svcnum, 'UpdateAccountSettings',
+    'accountName' => $svc_acct->email,
+    'AccessModes' => $self->option('AccessModes'),
+  );
+}
 
 sub communigate_pro_queue {
   my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $sub = $method eq 'CreateAccount'
-              ? 'CreateAccount'
+  my @kludge_methods = qw(CreateAccount UpdateAccountSettings);
+  my $sub = grep { $method eq $_ } @kludge_methods
+              ? $method
               : 'communigate_pro_command';
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
@@ -80,20 +97,30 @@ sub communigate_pro_queue {
 }
 
 sub CreateAccount {
-  my( $machine, $port, $login, $password, $method, @args ) = @_;
-
-  my %args = @args;
+  my( $machine, $port, $login, $password, $method, %args ) = @_;
   my $accountName  = delete $args{'accountName'};
   my $accountType  = delete $args{'accountType'};
   my $externalFlag = delete $args{'externalFlag'};
   $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
-  @args = ( accountName => $accountName, [ settings => \%args ],
-            accountType => $accountType, externalFlag => $externalFlag, );
+  my @args = ( accountName => $accountName,
+               accountType  => $accountType,
+               settings     => \%args,
+             );
+               #externalFlag => $externalFlag,
+  push @args, externalFlag => $externalFlag if $externalFlag;
 
-  communigate_pro_command( $machine, $port, $login, $password, $method, @args );
+  &communigate_pro_command( $machine, $port, $login, $password, $method, @args);
 
 }
 
+sub UpdateAccountSettings {
+  my( $machine, $port, $login, $password, $method, %args ) = @_;
+  my $accountName  = delete $args{'accountName'};
+  $args{'AccessModes'} = [ split(' ', $args{'AccessModes'}) ];
+  @args = ( $accountName, \%args );
+  &communigate_pro_command( $machine, $port, $login, $password, $method, @args);
+}
+
 sub communigate_pro_command { #subroutine, not method
   my( $machine, $port, $login, $password, $method, @args ) = @_;