projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e2c96e
)
#29052 Pass domain to Aradial
author
Jeremy Davis
<jeremyd@freeside.biz>
Tue, 9 Sep 2014 19:47:22 +0000
(15:47 -0400)
committer
Jeremy Davis
<jeremyd@freeside.biz>
Tue, 9 Sep 2014 19:47:22 +0000
(15:47 -0400)
FS/FS/part_export/aradial.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/aradial.pm
b/FS/FS/part_export/aradial.pm
index
1963e95
..
296430a
100644
(file)
--- a/
FS/FS/part_export/aradial.pm
+++ b/
FS/FS/part_export/aradial.pm
@@
-55,7
+55,7
@@
sub export_insert {
sub export_replace {
my ($self, $new, $old) = @_;
sub export_replace {
my ($self, $new, $old) = @_;
- if ($new->
username ne $old->username
) {
+ if ($new->
email ne $old->email
) {
return $old->export_delete || $new->export_insert;
}
my $UserLockout = 0;
return $old->export_delete || $new->export_insert;
}
my $UserLockout = 0;
@@
-63,7
+63,7
@@
sub export_replace {
$self->request_user_edit(
'Page' => 'UserEdit',
'Modify' => 1,
$self->request_user_edit(
'Page' => 'UserEdit',
'Modify' => 1,
- 'UserID' => $old->
username
,
+ 'UserID' => $old->
email
,
$self->svc_acct_params($new),
UserLockout => $UserLockout,
);
$self->svc_acct_params($new),
UserLockout => $UserLockout,
);
@@
-73,7
+73,7
@@
sub export_suspend {
my ($self, $svc) = @_;
$self->request_user_edit(
'Modify' => 1,
my ($self, $svc) = @_;
$self->request_user_edit(
'Modify' => 1,
- 'UserID' => $svc->
username
,
+ 'UserID' => $svc->
email
,
'UserLockout' => 1,
);
}
'UserLockout' => 1,
);
}
@@
-82,7
+82,7
@@
sub export_unsuspend {
my ($self, $svc) = @_;
$self->request_user_edit(
'Modify' => 1,
my ($self, $svc) = @_;
$self->request_user_edit(
'Modify' => 1,
- 'UserID' => $svc->
username
,
+ 'UserID' => $svc->
email
,
'UserLockout' => 0,
);
}
'UserLockout' => 0,
);
}
@@
-91,7
+91,7
@@
sub export_delete {
my ($self, $svc) = @_;
$self->request_user_edit(
'ConfirmDelete' => 1,
my ($self, $svc) = @_;
$self->request_user_edit(
'ConfirmDelete' => 1,
- ('$Checked$' . $svc->
username
) => 1,
+ ('$Checked$' . $svc->
email
) => 1,
);
}
);
}
@@
-149,7
+149,7
@@
sub svc_acct_params {
my $expire_date = $pkg->expire ? time2str('D%Y-%m-%d', $pkg->expire) : '';
(
my $expire_date = $pkg->expire ? time2str('D%Y-%m-%d', $pkg->expire) : '';
(
- 'db_Users.UserID' => $svc->
username
,
+ 'db_Users.UserID' => $svc->
email
,
$self->password_params($svc),
'db_$N$Users.Status' => 0, # we suspend using UserLockout
'db_$D$Users.StartDate' => $setup_date,
$self->password_params($svc),
'db_$N$Users.Status' => 0, # we suspend using UserLockout
'db_$D$Users.StartDate' => $setup_date,