sub rebless { shift; }
+sub export_username {
+ my($self, $svc_acct) = (shift, shift);
+ $svc_acct->email;
+}
+
sub _export_insert {
my( $self, $svc_acct ) = (shift, shift);
my @options = ( $svc_acct->svcnum, 'CreateAccount',
- 'accountName' => $svc_acct->email,
+ 'accountName' => $self->export_username($svc_acct),
'accountType' => $self->option('accountType'),
'AccessModes' => $self->option('AccessModes'),
'RealName' => $svc_acct->finger,
sub _export_replace {
my( $self, $new, $old ) = (shift, shift, shift);
- return "can't (yet) change domain with CommuniGate Pro"
- if $old->domain ne $new->domain;
return "can't (yet) change username with CommuniGate Pro"
if $old->username ne $new->username;
+ return "can't (yet) change domain with CommuniGate Pro"
+ if $self->export_username($old) ne $self->export_username($new);
return "can't (yet) change GECOS with CommuniGate Pro"
if $old->finger ne $new->finger;
return "can't (yet) change quota with CommuniGate Pro"
#my $jobnum = $err_or_queue->jobnum;
$self->communigate_pro_queue( $new->svcnum, 'SetAccountPassword',
- $new->email, $new->_password )
+ $self->export_username($new), $new->_password )
if $new->_password ne $old->_password;
}
sub _export_delete {
my( $self, $svc_acct ) = (shift, shift);
$self->communigate_pro_queue( $svc_acct->svcnum, 'DeleteAccount',
- $svc_acct->email,
+ $self->export_username($svc_acct),
);
}
sub _export_suspend {
my( $self, $svc_acct ) = (shift, shift);
$self->communigate_pro_queue( $svc_acct->svcnum, 'UpdateAccountSettings',
- 'accountName' => $svc_acct->email,
+ 'accountName' => $self->export_username($svc_acct),
'AccessModes' => 'Mail',
);
}
sub _export_unsuspend {
my( $self, $svc_acct ) = (shift, shift);
$self->communigate_pro_queue( $svc_acct->svcnum, 'UpdateAccountSettings',
- 'accountName' => $svc_acct->email,
+ 'accountName' => $self->export_username($svc_acct),
'AccessModes' => $self->option('AccessModes'),
);
}
sub communigate_pro_queue {
my( $self, $svcnum, $method ) = (shift, shift, shift);
my @kludge_methods = qw(CreateAccount UpdateAccountSettings);
- my $sub = grep { $method eq $_ } @kludge_methods
- ? $method
- : 'communigate_pro_command';
+ my $sub = 'communigate_pro_command';
+ $sub = $method if grep { $method eq $_ } @kludge_methods;
my $queue = new FS::queue {
'svcnum' => $svcnum,
'job' => "FS::part_export::communigate_pro::$sub",