X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=f592a838aa85e7c66c109e8fb9c18ac13b40c6be;hb=6eedae5614eee808d0e0c4b9d9b3fe7d1217b776;hp=4e943605f07f8af5c8f7d8e39c13611cf1219686;hpb=cd5d6c049041ee198e38687e7dd0a63f3d21b2ef;p=freeside.git

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 4e943605f..f592a838a 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -1,6 +1,7 @@
 package FS::part_export::shellcommands;
 
 use vars qw(@ISA @saltset);
+use String::ShellQuote;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
@@ -19,14 +20,42 @@ sub _export_delete {
   $self->_export_command('userdel', @_);
 }
 
+sub _export_suspend {
+  my($self) = shift;
+  $self->_export_command('suspend', @_);
+}
+
+sub _export_unsuspend {
+  my($self) = shift;
+  $self->_export_command('unsuspend', @_);
+}
+
 sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
+  return '' if $command =~ /^\s*$/;
   my $stdin = $self->option($action."_stdin");
-  no strict 'refs';
-  ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+
+  no strict 'vars';
+  {
+    no strict 'refs';
+    ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+  }
+
+  my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
+  if ( $cust_pkg ) {
+    $email = ( grep { $_ ne 'POST' } $cust_pkg->cust_main->invoicing_list )[0];
+  } else {
+    $email = '';
+  }
+
+  $finger = shell_quote $finger;
+  $quoted_password = shell_quote $_password;
+  $domain = $svc_acct->domain;
+  $crypt_password = ''; #surpress "used only once" warnings
   $crypt_password = crypt( $svc_acct->_password,
-                           $saltset[int(rand(64))].$saltset[int(rand(64))] );
+                             $saltset[int(rand(64))].$saltset[int(rand(64))] );
+
   $self->shellcommands_queue( $svc_acct->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
@@ -39,10 +68,18 @@ sub _export_replace {
   my($self, $new, $old ) = (shift, shift, shift);
   my $command = $self->option('usermod');
   my $stdin = $self->option('usermod_stdin');
-  no strict 'refs';
-  ${"old_$_"} = $old->getfield($_) foreach $old->fields;
-  ${"new_$_"} = $new->getfield($_) foreach $new->fields;
-  $new_crypt_password = crypt( $svc_acct->_password,
+  no strict 'vars';
+  {
+    no strict 'refs';
+    ${"old_$_"} = $old->getfield($_) foreach $old->fields;
+    ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  }
+  $new_finger = shell_quote $new_finger;
+  $quoted_new__password = shell_quote $new__password;
+  $old_domain = $old->domain;
+  $new_domain = $new->domain;
+  $new_crypt_password = ''; #surpress "used only once" warnings
+  $new_crypt_password = crypt( $new->_password,
                                $saltset[int(rand(64))].$saltset[int(rand(64))]);
   $self->shellcommands_queue( $new->svcnum,
     user         => $self->option('user')||'root',
@@ -63,7 +100,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.06';
+  use Net::SSH '0.07';
   &Net::SSH::ssh_cmd( { @_ } );
 }