Die globale Variable $sendmail wird nur in SL/Mailer.pm benötigt und sollte deswegen...

diff --git a/SL/DN.pm b/SL/DN.pm
index 125e33ca1a65141ce0d8db8c2b72c9d8811300dc..2b6cd63fdd07501a87033a2f891422c3452ad76f 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -266,7 +266,7 @@ sub create_invoice_for_fees {
 sub save_dunning {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $rows, $userspath, $spool, $sendmail) = @_;
+  my ($self, $myconfig, $form, $rows, $userspath, $spool) = @_;
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index e530050adf40267239b3e65ded54fa7bad4cf7a9..c3e7966c3fe09e4116aa98563b74146a0cfc9762 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -191,7 +191,7 @@ sub save_dunning {
       foreach my $level (values %{ $levels }) {
         next unless scalar @{ $level };
 
-        DN->save_dunning(\%myconfig, $form, $level, $userspath, $spool, $sendmail);
+        DN->save_dunning(\%myconfig, $form, $level, $userspath, $spool);
       }
     }
 
@@ -204,7 +204,7 @@ sub save_dunning {
                       "customer_id"            => $form->{"customer_id_$i"},
                       "next_dunning_config_id" => $form->{"next_dunning_config_id_$i"},
                       "email"                  => $form->{"email_$i"}, } ];
-      DN->save_dunning(\%myconfig, $form, $level, $userspath, $spool, $sendmail);
+      DN->save_dunning(\%myconfig, $form, $level, $userspath, $spool);
     }
   }
 

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 1a2999bdee34f2c07d8ed48b74bfdeb90d23ffa5..4461286330cda72c4555eef77e14a9951c9ddc6d 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -1656,9 +1656,7 @@ sub print_form {
   }
 
   $form->{IN}  = "$form->{type}.$suffix";
-  $form->{OUT} =
-    $form->{media} eq 'email'   ? $sendmail              :
-    $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
+  $form->{OUT} = $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
 
   # Save $form->{email} because it will be overwritten.
   $form->{EMAIL_RECIPIENT} = $form->{email};