#29052 Pass domain to Aradial

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

diff --git a/FS/FS/part_export/aradial.pm b/FS/FS/part_export/aradial.pm
index f3de614..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) = @_;
-  if ($new->username ne $old->username) {
+  if ($new->email ne $old->email) {
     return $old->export_delete || $new->export_insert;
   }
   my $UserLockout = 0;
@@ -63,6 +63,7 @@ sub export_replace {
   $self->request_user_edit(
     'Page'    => 'UserEdit',
     'Modify'  => 1,
+    'UserID'  => $old->email,
     $self->svc_acct_params($new),
     UserLockout => $UserLockout,
   );
@@ -72,7 +73,7 @@ sub export_suspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
-    'UserID'  => $svc->username,
+    'UserID'  => $svc->email,
     'UserLockout' => 1,
   );
 }
@@ -81,7 +82,7 @@ sub export_unsuspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
-    'UserID'  => $svc->username,
+    'UserID'  => $svc->email,
     'UserLockout' => 0,
   );
 }
@@ -90,7 +91,7 @@ sub export_delete {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'ConfirmDelete' => 1,
-    ('$Delete$' . $svc->username) => 1,
+    ('$Checked$' . $svc->email) => 1,
   );
 }
 
@@ -118,7 +119,7 @@ sub request_user_edit {
 sub request {
   my $self = shift;
   my @params = @_;
-  my $path = '/Admin'; # I think this is always right
+  my $path = '/ArdWeb/ARDAdminIs.dll'; # I think this is always right
   my $url = URI->new('http://' . $self->host . $path);
   warn "$me request: \n".Dumper(\@params)."\n\n" if $DEBUG >= 2;
   my $response = $self->ua->post($url, \@params);
@@ -148,7 +149,7 @@ sub svc_acct_params {
   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,