X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=2066db418f8907f3dfaebde6ac1b6ed968ddc2a9;hp=7baf2dabe39f0a3a1f570c096d95ab32bfd28ae4;hb=7479ebeef980e574a231441693d724c5c2d7d9c7;hpb=a83a000a027d1272e813259d09230d701d84df64

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 7baf2dabe..2066db418 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -95,7 +95,7 @@ tie my %options, 'Tie::IxHash',
 Run remote commands via SSH.  Usernames are considered unique (also see
 shellcommands_withdomain).  You probably want this if the commands you are
 running will not accept a domain as a parameter.  You will need to
-<a href="../docs/ssh.html">setup SSH for unattended operation</a>.
+<a href="http://www.freeside.biz/mediawiki/index.php/Freeside:1.9:Documentation:Administration:SSH_Keys">setup SSH for unattended operation</a>.
 
 <BR><BR>Use these buttons for some useful presets:
 <UL>
@@ -192,7 +192,8 @@ old_ for replace operations):
   <LI><code>$reasontypetext (when suspending)</code>
   <LI><code>$pkgnum</code>
   <LI><code>$custnum</code>
-  <LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.
+  <LI>All other fields in <b>svc_acct</b> are also available.
+  <LI>The following fields from <b>cust_main</b> are also available (except during replace): company, address1, address2, city, state, zip, county, daytime, night, fax, otaker, agent_custid.  When used on the command line (rather than STDIN), they will be quoted for the shell already (do not add additional quotes).
 </UL>
 END
 );
@@ -258,6 +259,16 @@ sub _export_command {
 
   my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
   if ( $cust_pkg ) {
+    no strict 'vars';
+    {
+      no strict 'refs';
+      foreach my $custf (qw( company address1 address2 city state zip country
+                             daytime night fax otaker agent_custid
+                        ))
+      {
+        ${$custf} = $cust_pkg->cust_main->$custf();
+      }
+    }
     $email = ( grep { $_ !~ /^(POST|FAX)$/ } $cust_pkg->cust_main->invoicing_list )[0];
   } else {
     $email = '';
@@ -309,6 +320,9 @@ sub _export_command {
     $reasonnum = $reasontext = $reasontypenum = $reasontypetext = '';
   }
 
+  $pkgnum = $cust_pkg ? $cust_pkg->pkgnum : '';
+  $custnum = $cust_pkg ? $cust_pkg->custnum : '';
+
   my $stdin_string = eval(qq("$stdin"));
 
   $first = shell_quote $first;
@@ -316,8 +330,19 @@ sub _export_command {
   $finger = shell_quote $finger;
   $crypt_password = shell_quote $crypt_password;
   $ldap_password  = shell_quote $ldap_password;
-  $pkgnum = $cust_pkg ? $cust_pkg->pkgnum : '';
-  $custnum = $cust_pkg ? $cust_pkg->custnum : '';
+
+  $company = shell_quote $company;
+  $address1 = shell_quote $address1;
+  $address2 = shell_quote $address2;
+  $city = shell_quote $city;
+  $state = shell_quote $state;
+  $zip = shell_quote $zip;
+  $country = shell_quote $country;
+  $daytime = shell_quote $daytime;
+  $night = shell_quote $night;
+  $fax = shell_quote $fax;
+  $otaker = shell_quote $otaker; 
+  $acct_custid = shell_quote $acct_custid;
 
   my $command_string = eval(qq("$command"));
   my @ssh_cmd_args = (
@@ -351,6 +376,8 @@ sub _export_replace {
   }
   my $old_cust_pkg = $old->cust_svc->cust_pkg;
   my $new_cust_pkg = $new->cust_svc->cust_pkg;
+  my $new_cust_main = $new_cust_pkg ? $new_cust_pkg->cust_main : '';
+
   $new_finger =~ /^(.*)\s+(\S+)$/ or $new_finger =~ /^((.*))$/;
   ($new_first, $new_last ) = ( $1, $2 );
   $quoted_new__password = shell_quote $new__password; #old, wrong?
@@ -391,6 +418,12 @@ sub _export_replace {
   return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
     if $error;
 
+  $new_agent_custid = $new_cust_main ? $new_cust_main->agent_custid : '';
+  $old_pkgnum = $old_cust_pkg ? $old_cust_pkg->pkgnum : '';
+  $old_custnum = $old_cust_pkg ? $old_cust_pkg->custnum : '';
+  $new_pkgnum = $new_cust_pkg ? $new_cust_pkg->pkgnum : '';
+  $new_custnum = $new_cust_pkg ? $new_cust_pkg->custnum : '';
+
   my $stdin_string = eval(qq("$stdin"));
 
   $new_first = shell_quote $new_first;
@@ -398,10 +431,7 @@ sub _export_replace {
   $new_finger = shell_quote $new_finger;
   $new_crypt_password = shell_quote $new_crypt_password;
   $new_ldap_password  = shell_quote $new_ldap_password;
-  $old_pkgnum = $old_cust_pkg ? $old_cust_pkg->pkgnum : '';
-  $old_custnum = $old_cust_pkg ? $old_cust_pkg->custnum : '';
-  $new_pkgnum = $new_cust_pkg ? $new_cust_pkg->pkgnum : '';
-  $new_custnum = $new_cust_pkg ? $new_cust_pkg->custnum : '';
+  $new_agent_custid = shell_quote $new_agent_custid;
 
   my $command_string = eval(qq("$command"));