Filehandles lokal deklarieren. Kosmetik. In Mailer.pm open() nur mit festgelegtem...

diff --git a/SL/Form.pm b/SL/Form.pm
index f29c67166f1763153abffca1c429b42c6301db6e..5a5005eff191bebd7ae3a57c1cfa79a89dd6849b 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -731,7 +731,9 @@ sub parse_template {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $userspath) = @_;
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $userspath) = @_;

-  my $template;
+  my ($template, $out);
+
+  local (*IN, *OUT);

 
   $self->{"cwd"} = getcwd();
   $self->{"tmpdir"} = $self->{cwd} . "/${userspath}";
 
   $self->{"cwd"} = getcwd();
   $self->{"tmpdir"} = $self->{cwd} . "/${userspath}";


@@ -775,6 +777,7 @@ sub parse_template {
   # for postscript we store a copy in a temporary file
   my $fileid = time;
   $self->{tmpfile} ||= "$userspath/${fileid}.$self->{IN}";
   # for postscript we store a copy in a temporary file
   my $fileid = time;
   $self->{tmpfile} ||= "$userspath/${fileid}.$self->{IN}";

+

   if ($template->uses_temp_file() || $self->{media} eq 'email') {
     $out = $self->{OUT};
     $self->{OUT} = ">$self->{tmpfile}";
   if ($template->uses_temp_file() || $self->{media} eq 'email') {
     $out = $self->{OUT};
     $self->{OUT} = ">$self->{tmpfile}";


@@ -841,7 +844,7 @@ sub parse_template {
 
       }
 
 
       }
 

-      my $err = $mail->send($out);
+      my $err = $mail->send();

       $self->error($self->cleanup . "$err") if ($err);
 
     } else {
       $self->error($self->cleanup . "$err") if ($err);
 
     } else {

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index aec34e67d45169c6f78d364d074a752ba43257c5..7b011d4b0ddb1076454bf36bb949ee57b3a6df95 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -89,7 +89,9 @@ sub mime_quote_text {
 sub send {
   $main::lxdebug->enter_sub();
 
 sub send {
   $main::lxdebug->enter_sub();
 

-  my ($self, $out) = @_;
+  my ($self) = @_;
+
+  local (*IN, *OUT);

 
   my $boundary = time;
   $boundary = "LxOffice-$self->{version}-$boundary";
 
   my $boundary = time;
   $boundary = "LxOffice-$self->{version}-$boundary";


@@ -99,16 +101,9 @@ sub send {
 
   $self->{charset} = Common::DEFAULT_CHARSET unless $self->{charset};
 
 
   $self->{charset} = Common::DEFAULT_CHARSET unless $self->{charset};
 

-  if ($out) {
-    if (!open(OUT, $out)) {
-      $main::lxdebug->leave_sub();
-      return "$out : $!";
-    }
-  } else {
-    if (!open(OUT, ">-")) {
-      $main::lxdebug->leave_sub();
-      return "STDOUT : $!";
-    }
+  if (!open(OUT, $main::sendmail)) {
+    $main::lxdebug->leave_sub();
+    return "$main::sendmail : $!";

   }
 
   $self->{contenttype} = "text/plain" unless $self->{contenttype};
   }
 
   $self->{contenttype} = "text/plain" unless $self->{contenttype};

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 6975fd9c194e25c8fdf0bf9e668346b5e1f57c70..d150c2ca073bd68f5bdf8d114e1a8d6a0cbe8629 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1748,8 +1748,6 @@ sub print_form {
     $form->{subject} = qq|$form->{label} $form->{"${inv}number"}|
       unless $form->{subject};
 
     $form->{subject} = qq|$form->{label} $form->{"${inv}number"}|
       unless $form->{subject};
 

-    $form->{OUT} = "$sendmail";
-

     $form->{emailed} .= " $form->{formname}";
     $form->{emailed} =~ s/^ //;
   }
     $form->{emailed} .= " $form->{formname}";
     $form->{emailed} =~ s/^ //;
   }