Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 6551fc7a

Von Moritz Bunkus vor fast 13 Jahren hinzugefügt

  • ID 6551fc7afae60f2a4e01bcfdbe68f9a560c10504
  • Vorgänger 385b3e28
  • Nachfolger 35caef2b

Kosmetik

Unterschiede anzeigen:

SL/Form.pm
1107 1107
  close $temp_fh;
1108 1108

  
1109 1109
  if ($template->uses_temp_file() || $self->{media} eq 'email') {
1110
    $out = $self->{OUT};
1111
    $out_mode = $self->{OUT_MODE} || '>';
1112
    $self->{OUT} = "$self->{tmpfile}";
1110
    $out              = $self->{OUT};
1111
    $out_mode         = $self->{OUT_MODE} || '>';
1112
    $self->{OUT}      = "$self->{tmpfile}";
1113 1113
    $self->{OUT_MODE} = '>';
1114 1114
  }
1115 1115

  
......
1155 1155

  
1156 1156
      # if we send html or plain text inline
1157 1157
      if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
1158
        $mail->{contenttype} = "text/html";
1159

  
1160
        $mail->{message}       =~ s/\r//g;
1161
        $mail->{message}       =~ s/\n/<br>\n/g;
1162
        $myconfig->{signature} =~ s/\n/<br>\n/g;
1163
        $mail->{message} .= "<br>\n-- <br>\n$myconfig->{signature}\n<br>";
1158
        $mail->{contenttype}    =  "text/html";
1159
        $mail->{message}        =~ s/\r//g;
1160
        $mail->{message}        =~ s/\n/<br>\n/g;
1161
        $myconfig->{signature}  =~ s/\n/<br>\n/g;
1162
        $mail->{message}       .=  "<br>\n-- <br>\n$myconfig->{signature}\n<br>";
1164 1163

  
1165 1164
        open(IN, "<", $self->{tmpfile})
1166 1165
          or $self->error($self->cleanup . "$self->{tmpfile} : $!");
1167
        while (<IN>) {
1168
          $mail->{message} .= $_;
1169
        }
1170

  
1166
        $mail->{message} .= $_ while <IN>;
1171 1167
        close(IN);
1172 1168

  
1173 1169
      } else {
......
1204 1200
      #print(STDERR "OUT $self->{OUT}\n");
1205 1201
      for my $i (1 .. $self->{copies}) {
1206 1202
        if ($self->{OUT}) {
1207
          open OUT, $self->{OUT_MODE}, $self->{OUT} or $self->error($self->cleanup . "$self->{OUT} : $!");
1203
          open  OUT, $self->{OUT_MODE}, $self->{OUT} or $self->error($self->cleanup . "$self->{OUT} : $!");
1208 1204
          print OUT $_ while <IN>;
1209 1205
          close OUT;
1210
          seek IN, 0, 0;
1206
          seek  IN, 0, 0;
1211 1207

  
1212 1208
        } else {
1213 1209
          $self->{attachment_filename} = ($self->{attachment_filename})
bin/mozilla/io.pl
1517 1517
  delete $form->{OUT};
1518 1518

  
1519 1519
  if ($form->{media} eq 'printer') {
1520
    #$form->{OUT} = "| $form->{printer_command} &>/dev/null";
1521 1520
    $form->{OUT}      = $form->{printer_command};
1522 1521
    $form->{OUT_MODE} = '|-';
1523 1522
    $form->{printed} .= " $form->{formname}";

Auch abrufbar als: Unified diff