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

(-)a/basket/sendbasket.pl (-9 / +3 lines)
Lines 122-127 if ( $email_add ) { Link Here
122
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
122
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
123
        $email_header = $1;
123
        $email_header = $1;
124
        $email_header =~ s|\n?(.*)\n?|$1|;
124
        $email_header =~ s|\n?(.*)\n?|$1|;
125
        $email_header = encode_qp($email_header);
125
    }
126
    }
126
127
127
    my $email_file = "basket.txt";
128
    my $email_file = "basket.txt";
Lines 133-151 if ( $email_add ) { Link Here
133
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
134
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
134
        $body = $1;
135
        $body = $1;
135
        $body =~ s|\n?(.*)\n?|$1|;
136
        $body =~ s|\n?(.*)\n?|$1|;
136
        $body = encode("UTF-8", encode_qp($body));
137
        $body = encode_qp($body);
137
    }
138
    }
138
139
139
    my $boundary = "====" . time() . "====";
140
    my $boundary = "====" . time() . "====";
140
141
141
    #     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
142
    # Writing mail
142
    #
143
    #     $email_header = encode_qp($email_header);
144
    #
145
    #     $boundary = "--".$boundary;
146
    #
147
    #     # Writing mail
148
    #     $mail{body} =
149
    $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
143
    $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
150
    my $isofile = encode_base64(encode("UTF-8", $iso2709));
144
    my $isofile = encode_base64(encode("UTF-8", $iso2709));
151
    $boundary = '--' . $boundary;
145
    $boundary = '--' . $boundary;
(-)a/opac/opac-sendbasket.pl (-1 / +2 lines)
Lines 138-143 if ( $email_add ) { Link Here
138
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
138
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
139
        $email_header = $1;
139
        $email_header = $1;
140
        $email_header =~ s|\n?(.*)\n?|$1|;
140
        $email_header =~ s|\n?(.*)\n?|$1|;
141
        $email_header = encode_qp($email_header);
141
    }
142
    }
142
143
143
    my $email_file = "basket.txt";
144
    my $email_file = "basket.txt";
Lines 149-155 if ( $email_add ) { Link Here
149
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
150
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
150
        $body = $1;
151
        $body = $1;
151
        $body =~ s|\n?(.*)\n?|$1|;
152
        $body =~ s|\n?(.*)\n?|$1|;
152
        $body = encode("UTF-8", encode_qp($body));
153
        $body = encode_qp($body);
153
    }
154
    }
154
155
155
    $mail{body} = $body;
156
    $mail{body} = $body;
(-)a/opac/opac-sendshelf.pl (-1 / +2 lines)
Lines 135-140 if ( $email ) { Link Here
135
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
135
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
136
        $email_header = $1;
136
        $email_header = $1;
137
        $email_header =~ s|\n?(.*)\n?|$1|;
137
        $email_header =~ s|\n?(.*)\n?|$1|;
138
        $email_header = encode_qp($email_header);
138
    }
139
    }
139
140
140
    my $email_file = "list.txt";
141
    my $email_file = "list.txt";
Lines 146-152 if ( $email ) { Link Here
146
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
147
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
147
        $body = $1;
148
        $body = $1;
148
        $body =~ s|\n?(.*)\n?|$1|;
149
        $body =~ s|\n?(.*)\n?|$1|;
149
        $body = encode("UTF-8", encode_qp($body));
150
        $body = encode_qp($body);
150
    }
151
    }
151
152
152
    my $boundary = "====" . time() . "====";
153
    my $boundary = "====" . time() . "====";
(-)a/virtualshelves/sendshelf.pl (-2 / +2 lines)
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($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 = encode_qp($body);
141
    }
142
    }
142
143
143
    my $boundary = "====" . time() . "====";
144
    my $boundary = "====" . time() . "====";
144
- 

Return to bug 12065