X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fdomain_shellcommands.pm;h=582e29217a7297af3ecf72410940069d4d77fe3d;hb=03eaa0e229c5f5fc68a178d20fb69733db709787;hp=d15f41a840debf081546f452022234d02502b775;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git

diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index d15f41a84..582e29217 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>
@@ -112,19 +112,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