gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 11248: fix encoding issue on emailing a list (OPAC) 

Test plan:
- send a list via email with the english version.
- translate templates and retry with another language.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely. Links to the OPAC are correct.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Jonathan Druart 2013-11-14 14:05:53 +01:00 committed by Galen Charlton
parent 9181636874
commit 394ece2e10
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
opac/opac-sendshelf.pl
View File

@ -21,7 +21,7 @@ use strict;
use warnings;
use CGI;
use Encode;
use Encode qw(decode encode);
use Carp;
use Mail::Sendmail;
@ -122,19 +122,32 @@ if ( $email ) {
# Getting template result
my $template_res = $template2->output();
my $body;
# Analysing information and getting mail properties
$mail{'subject'} = $template_res =~ /<SUBJECT>\n(.*)\n?<END_SUBJECT>/s
? $1 : "no subject";
if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
$mail{subject} = $1;
$mail{subject} =~ s|\n?(.*)\n?|$1|;
}
else { $mail{'subject'} = "no subject"; }
my ($email_header) = $template_res =~ /<HEADER>\n(.*)\n?<END_HEADER>/s;
my $email_header = "";
if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
$email_header = $1;
$email_header =~ s|\n?(.*)\n?|$1|;
}
my $email_file = $template_res =~ /<FILENAME>\n(.*)\n?<END_FILENAME>/s
? $1
: "list.txt";
my $email_file = "list.txt";
if ( $template_res =~ /<FILENAME>(.*)<END_FILENAME>/s ) {
$email_file = $1;
$email_file =~ s|\n?(.*)\n?|$1|;
}
my ($body) = $template_res =~ /<MESSAGE>\n(.*)\n?<END_MESSAGE>/s;
$body = encode_qp($body);
if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
$body = $1;
$body =~ s|\n?(.*)\n?|$1|;
$body = encode("UTF-8", encode_qp($body));
}
my $boundary = "====" . time() . "====";