View | Details | Raw Unified | Return to bug 11944
Collapse All | Expand All

(-)a/basket/sendbasket.pl (-2 / +3 lines)
Lines 112-117 if ( $email_add ) { Link Here
112
    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
112
    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
113
        $mail{subject} = $1;
113
        $mail{subject} = $1;
114
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
114
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
115
        $mail{subject} = Encode::encode("UTF-8", $mail{subject});
115
    }
116
    }
116
    else { $mail{'subject'} = "no subject"; }
117
    else { $mail{'subject'} = "no subject"; }
117
118
Lines 119-125 if ( $email_add ) { Link Here
119
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
120
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
120
        $email_header = $1;
121
        $email_header = $1;
121
        $email_header =~ s|\n?(.*)\n?|$1|;
122
        $email_header =~ s|\n?(.*)\n?|$1|;
122
        $email_header = encode_qp($email_header);
123
        $email_header = encode_qp(Encode::encode("UTF-8", $email_header));
123
    }
124
    }
124
125
125
    my $email_file = "basket.txt";
126
    my $email_file = "basket.txt";
Lines 131-137 if ( $email_add ) { Link Here
131
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
132
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
132
        $body = $1;
133
        $body = $1;
133
        $body =~ s|\n?(.*)\n?|$1|;
134
        $body =~ s|\n?(.*)\n?|$1|;
134
        $body = encode_qp($body);
135
        $body = encode_qp(Encode::encode("UTF-8", $body));
135
    }
136
    }
136
137
137
    my $boundary = "====" . time() . "====";
138
    my $boundary = "====" . time() . "====";
(-)a/opac/opac-sendbasket.pl (-2 / +3 lines)
Lines 131-136 if ( $email_add ) { Link Here
131
    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
131
    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
132
        $mail{subject} = $1;
132
        $mail{subject} = $1;
133
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
133
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
134
        $mail{subject} = Encode::encode("UTF-8", $mail{subject});
134
    }
135
    }
135
    else { $mail{'subject'} = "no subject"; }
136
    else { $mail{'subject'} = "no subject"; }
136
137
Lines 138-144 if ( $email_add ) { Link Here
138
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
139
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
139
        $email_header = $1;
140
        $email_header = $1;
140
        $email_header =~ s|\n?(.*)\n?|$1|;
141
        $email_header =~ s|\n?(.*)\n?|$1|;
141
        $email_header = encode_qp($email_header);
142
        $email_header = encode_qp(Encode::encode("UTF-8", $email_header));
142
    }
143
    }
143
144
144
    my $email_file = "basket.txt";
145
    my $email_file = "basket.txt";
Lines 150-156 if ( $email_add ) { Link Here
150
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
151
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
151
        $body = $1;
152
        $body = $1;
152
        $body =~ s|\n?(.*)\n?|$1|;
153
        $body =~ s|\n?(.*)\n?|$1|;
153
        $body = encode_qp($body);
154
        $body = encode_qp(Encode::encode("UTF-8", $body));
154
    }
155
    }
155
156
156
    $mail{body} = $body;
157
    $mail{body} = $body;
(-)a/opac/opac-sendshelf.pl (-2 / +3 lines)
Lines 128-139 if ( $email ) { Link Here
128
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
128
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
129
    }
129
    }
130
    else { $mail{'subject'} = "no subject"; }
130
    else { $mail{'subject'} = "no subject"; }
131
    $mail{subject} = Encode::encode("UTF-8", $mail{subject});
131
132
132
    my $email_header = "";
133
    my $email_header = "";
133
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
134
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
134
        $email_header = $1;
135
        $email_header = $1;
135
        $email_header =~ s|\n?(.*)\n?|$1|;
136
        $email_header =~ s|\n?(.*)\n?|$1|;
136
        $email_header = encode_qp($email_header);
137
        $email_header = encode_qp(Encode::encode("UTF-8", $email_header));
137
    }
138
    }
138
139
139
    my $email_file = "list.txt";
140
    my $email_file = "list.txt";
Lines 145-151 if ( $email ) { Link Here
145
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
146
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
146
        $body = $1;
147
        $body = $1;
147
        $body =~ s|\n?(.*)\n?|$1|;
148
        $body =~ s|\n?(.*)\n?|$1|;
148
        $body = encode_qp($body);
149
        $body = encode_qp(Encode::encode("UTF-8", $body));
149
    }
150
    }
150
151
151
    my $boundary = "====" . time() . "====";
152
    my $boundary = "====" . time() . "====";
(-)a/virtualshelves/sendshelf.pl (-5 / +4 lines)
Lines 21-27 use strict; Link Here
21
use warnings;
21
use warnings;
22
22
23
use CGI qw ( -utf8 );
23
use CGI qw ( -utf8 );
24
use Encode qw(encode);
24
use Encode qw( encode );
25
use Carp;
25
use Carp;
26
26
27
use Mail::Sendmail;
27
use Mail::Sendmail;
Lines 119-125 if ($email) { Link Here
119
119
120
    # Analysing information and getting mail properties
120
    # Analysing information and getting mail properties
121
    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
121
    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
122
        $mail{subject} = $1;
122
        $mail{'subject'} = Encode::encode("UTF-8", $1);
123
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
123
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
124
    }
124
    }
125
    else { $mail{'subject'} = "no subject"; }
125
    else { $mail{'subject'} = "no subject"; }
Lines 128-134 if ($email) { Link Here
128
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
128
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
129
        $email_header = $1;
129
        $email_header = $1;
130
        $email_header =~ s|\n?(.*)\n?|$1|;
130
        $email_header =~ s|\n?(.*)\n?|$1|;
131
        $email_header = encode_qp($email_header);
131
        $email_header = encode_qp(Encode::encode("UTF-8", $email_header));
132
    }
132
    }
133
133
134
    my $email_file = "list.txt";
134
    my $email_file = "list.txt";
Lines 140-146 if ($email) { Link Here
140
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
140
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
141
        $body = $1;
141
        $body = $1;
142
        $body =~ s|\n?(.*)\n?|$1|;
142
        $body =~ s|\n?(.*)\n?|$1|;
143
        $body = encode_qp($body);
143
        $body = encode_qp(Encode::encode("UTF-8", $body));
144
    }
144
    }
145
145
146
    my $boundary = "====" . time() . "====";
146
    my $boundary = "====" . time() . "====";
147
- 

Return to bug 11944