Attachment #28246 for bug #11944

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




    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
        $mail{subject} = $1;
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
        $mail{subject} = Encode::encode("UTF-8", $mail{subject});
    }
    else { $mail{'subject'} = "no subject"; }


    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
        $email_header = $1;
        $email_header =~ s|\n?(.*)\n?|$1|;
        $email_header = encode_qp(Encode::encode("UTF-8", $email_header));
    }

    my $email_file = "basket.txt";

    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
        $body = $1;
        $body =~ s|\n?(.*)\n?|$1|;
        $body = encode_qp(Encode::encode("UTF-8", $body));
    }

    my $boundary = "====" . time() . "====";




    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
        $mail{subject} = $1;
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
        $mail{subject} = Encode::encode("UTF-8", $mail{subject});
    }
    else { $mail{'subject'} = "no subject"; }


    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
        $email_header = $1;
        $email_header =~ s|\n?(.*)\n?|$1|;
        $email_header = encode_qp(Encode::encode("UTF-8", $email_header));
    }

    my $email_file = "basket.txt";

    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
        $body = $1;
        $body =~ s|\n?(.*)\n?|$1|;
        $body = encode_qp(Encode::encode("UTF-8", $body));
    }

    $mail{body} = $body;




        $mail{subject} =~ s|\n?(.*)\n?|$1|;
    }
    else { $mail{'subject'} = "no subject"; }
    $mail{subject} = Encode::encode("UTF-8", $mail{subject});

    my $email_header = "";
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
        $email_header = $1;
        $email_header =~ s|\n?(.*)\n?|$1|;
        $email_header = encode_qp(Encode::encode("UTF-8", $email_header));
    }

    my $email_file = "list.txt";

    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
        $body = $1;
        $body =~ s|\n?(.*)\n?|$1|;
        $body = encode_qp(Encode::encode("UTF-8", $body));
    }

    my $boundary = "====" . time() . "====";




use warnings;

use CGI qw ( -utf8 );
use Encode qw( encode );
use Carp;

use Mail::Sendmail;


    # Analysing information and getting mail properties
    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
        $mail{'subject'} = Encode::encode("UTF-8", $1);
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
    }
    else { $mail{'subject'} = "no subject"; }

    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
        $email_header = $1;
        $email_header =~ s|\n?(.*)\n?|$1|;
        $email_header = encode_qp(Encode::encode("UTF-8", $email_header));
    }

    my $email_file = "list.txt";

    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
        $body = $1;
        $body =~ s|\n?(.*)\n?|$1|;
        $body = encode_qp(Encode::encode("UTF-8", $body));
    }

    my $boundary = "====" . time() . "====";
- 

Return to bug 11944

Lines 115-120 if ( $email_add ) { Link Here

(-)a/basket/sendbasket.pl (-2 / +3 lines)
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-128 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\|;
125	$email_header = encode_qp($email_header);	126	$email_header = encode_qp(Encode::encode("UTF-8", $email_header));
126	}	127	}
127		128
128	my $email_file = "basket.txt";	129	my $email_file = "basket.txt";
Lines 134-140 if ( $email_add ) { Link Here
134	if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {	135	if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
135	$body = $1;	136	$body = $1;
136	$body =~ s\|\n?(.*)\n?\|$1\|;	137	$body =~ s\|\n?(.*)\n?\|$1\|;
137	$body = encode_qp($body);	138	$body = encode_qp(Encode::encode("UTF-8", $body));
138	}	139	}
139		140
140	my $boundary = "====" . time() . "====";	141	my $boundary = "====" . time() . "====";

Lines 131-136 if ( $email_add ) { Link Here

(-)a/opac/opac-sendbasket.pl (-2 / +3 lines)
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;

Lines 130-141 if ( $email ) { Link Here

(-)a/opac/opac-sendshelf.pl (-2 / +3 lines)
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\|;
138	$email_header = encode_qp($email_header);	139	$email_header = encode_qp(Encode::encode("UTF-8", $email_header));
139	}	140	}
140		141
141	my $email_file = "list.txt";	142	my $email_file = "list.txt";
Lines 147-153 if ( $email ) { Link Here
147	if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {	148	if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
148	$body = $1;	149	$body = $1;
149	$body =~ s\|\n?(.*)\n?\|$1\|;	150	$body =~ s\|\n?(.*)\n?\|$1\|;
150	$body = encode_qp($body);	151	$body = encode_qp(Encode::encode("UTF-8", $body));
151	}	152	}
152		153
153	my $boundary = "====" . time() . "====";	154	my $boundary = "====" . time() . "====";

Lines 21-27 use strict; Link Here

(-)a/virtualshelves/sendshelf.pl (-5 / +4 lines)
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-132 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	$email_header = encode_qp(Encode::encode("UTF-8", $email_header));
130	}	130	}
131		131
132	my $email_file = "list.txt";	132	my $email_file = "list.txt";
Lines 138-144 if ( $email ) { Link Here
138	if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {	138	if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
139	$body = $1;	139	$body = $1;
140	$body =~ s\|\n?(.*)\n?\|$1\|;	140	$body =~ s\|\n?(.*)\n?\|$1\|;
141	$body = encode_qp($body);	141	$body = encode_qp(Encode::encode("UTF-8", $body));
142	}	142	}
143		143
144	my $boundary = "====" . time() . "====";	144	my $boundary = "====" . time() . "====";
145	-