spam settings, RT#15987
authorivan <ivan>
Thu, 9 Feb 2012 10:46:33 +0000 (10:46 +0000)
committerivan <ivan>
Thu, 9 Feb 2012 10:46:33 +0000 (10:46 +0000)
FS/FS/part_export/status_shellcommands.pm

index 6b18909..3f6bd95 100644 (file)
@@ -51,19 +51,18 @@ sub export_setstatus {
   $self->shellcommands_queue( @shallargs, 'command' =>
     $self->option('spam_enable'). ' '.
     shell_quote($svc_acct->email)
-  );
-
-  $self->shellcommands_queue( @shallargs, 'command' =>
-    $self->option('spam_tag2_level'). ' '.
-    shell_quote($svc_acct->email). ' '.
-    $hashref->{'spam_tag2_level'}
-  );
-
-  $self->shellcommands_queue( @shallargs, 'command' =>
-    $self->option('spam_kill_level'). ' '.
-    shell_quote($svc_acct->email). ' '.
-    $hashref->{'spam_kill_level'}
-  );
+  )
+    || $self->shellcommands_queue( @shallargs, 'command' =>
+         $self->option('spam_tag2_level'). ' '.
+         shell_quote($svc_acct->email). ' '.
+         $hashref->{'spam_tag2_level'}
+       )
+    || $self->shellcommands_queue( @shallargs, 'command' =>
+         $self->option('spam_kill_level'). ' '.
+         shell_quote($svc_acct->email). ' '.
+         $hashref->{'spam_kill_level'}
+       )
+  ;
 
 }