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

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

Return to bug 11944