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 lines)
Lines 128-133 if ( $email ) { Link Here
128
        ? $1 : "no subject";
128
        ? $1 : "no subject";
129
129
130
    my ($email_header) = $template_res =~ /<HEADER>\n(.*)\n?<END_HEADER>/s;
130
    my ($email_header) = $template_res =~ /<HEADER>\n(.*)\n?<END_HEADER>/s;
131
    $email_header = encode_qp($email_header);
131
132
132
    my $email_file = $template_res =~ /<FILENAME>\n(.*)\n?<END_FILENAME>/s
133
    my $email_file = $template_res =~ /<FILENAME>\n(.*)\n?<END_FILENAME>/s
133
        ? $1
134
        ? $1
(-)a/virtualshelves/sendshelf.pl (-3 / +4 lines)
Lines 123-129 if ( $email ) { Link Here
123
123
124
    my $email_header = "";
124
    my $email_header = "";
125
    if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
125
    if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
126
        $email_header = $1;
126
        $email_header = encode_qp($1);
127
    }
127
    }
128
128
129
    my $email_file = "basket.txt";
129
    my $email_file = "basket.txt";
Lines 131-137 if ( $email ) { Link Here
131
        $email_file = $1;
131
        $email_file = $1;
132
    }
132
    }
133
133
134
    if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = encode_qp($1); }
134
    if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) {
135
        $body = encode_qp($1);
136
    }
135
137
136
    my $boundary = "====" . time() . "====";
138
    my $boundary = "====" . time() . "====";
137
139
138
- 

Return to bug 12065