X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fdomain_shellcommands.pm;h=8e85d71e17d36ad8961081f1ab5fe38d9ff5024e;hb=674cb2d9d7105f4cc2871539b2e9f7088cdaa750;hp=914589529e952796cf24e9fcdb28bb40abfc2dfc;hpb=e53cf6b04ea8c6f10c331d46372c486128478df0;p=freeside.git

diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index 914589529..8e85d71e1 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -26,7 +26,7 @@ tie my %options, 'Tie::IxHash',
   'options' => \%options,
   'notes'   => <<'END'
 Run remote commands via SSH, for domains.  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>
   <LI>
@@ -34,6 +34,7 @@ Run remote commands via SSH, for domains.  You will need to
       this.form.useradd.value = "[ \"$uid\" -a \"$gid\" -a \"$dir\" -a \"$qdomain\" ] && [ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }";
       this.form.userdel.value = "";
       this.form.usermod.value = "";
+    '>
   <LI>
     <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
       this.form.useradd.value = "/usr/local/ispman/bin/ispman.addDomain -d $domain changeme";
@@ -48,8 +49,7 @@ The following variables are available for interpolation (prefixed with <code>new
   <LI><code>$uid</code> - of catchall account
   <LI><code>$gid</code> - of catchall account
   <LI><code>$dir</code> - home directory of catchall account
-  <LI>All other fields in
-    <a href="../docs/schema.html#svc_domain">svc_domain</a> are also available.
+  <LI>All other fields in <b>svc_domain</b> are also available.
 </UL>
 END
 );
@@ -69,6 +69,7 @@ sub _export_delete {
 sub _export_command {
   my ( $self, $action, $svc_domain) = (shift, shift, shift);
   my $command = $self->option($action);
+  return '' if $command =~ /^\s*$/;
 
   #set variable for the command
   no strict 'vars';
@@ -110,19 +111,22 @@ sub _export_replace {
   ( $old_qdomain = $old_domain ) =~ s/\./:/g; #see dot-qmail(5): EXTENSION ADDRESSES
   ( $new_qdomain = $new_domain ) =~ s/\./:/g; #see dot-qmail(5): EXTENSION ADDRESSES
 
-  if ( $old->catchall ) {
-    no strict 'refs';
-    my $svc_acct = $old->catchall_svc_acct;
-    ${"old_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
-  } else {
-    ${"old_$_"} = '' foreach qw(uid gid dir);
-  }
-  if ( $new->catchall ) {
+  { 
     no strict 'refs';
-    my $svc_acct = $new->catchall_svc_acct;
-    ${"new_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
-  } else {
-    ${"new_$_"} = '' foreach qw(uid gid dir);
+
+    if ( $old->catchall ) {
+      my $svc_acct = $old->catchall_svc_acct;
+      ${"old_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
+    } else {
+      ${"old_$_"} = '' foreach qw(uid gid dir);
+    }
+    if ( $new->catchall ) {
+      my $svc_acct = $new->catchall_svc_acct;
+      ${"new_$_"} = $svc_acct->getfield($_) foreach qw(uid gid dir);
+    } else {
+      ${"new_$_"} = '' foreach qw(uid gid dir);
+    }
+
   }
 
   #done setting variables for the command