From 76e8bb0fabd4a9ef85fd2dc5ad604c446a50f751 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 10 Apr 2014 14:40:01 +0200 Subject: [PATCH] Bug 12065: use encode_qp consistently when sending basket/shelf QP-encode both mail header and mail body when sending baskets or shelves. There is no need to Encode qp-encoded strings. Note that this does not solve all possible encoding problems in the mail sent. This is related to decoding CGI parameters and use of TT. That problem is addressed in bug 11944. Test plan: Verify if sending a basket from opac and staff still works. Check if sending a shelf (list) from opac and staff still functions as expected. Signed-off-by: Bernardo Gonzalez Kriegel Cart/List sent form opac/staff works No koha-qa errors Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- basket/sendbasket.pl | 12 +++--------- opac/opac-sendbasket.pl | 3 ++- opac/opac-sendshelf.pl | 3 ++- virtualshelves/sendshelf.pl | 3 ++- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index 885ee41a78..40547f0bc9 100755 --- a/basket/sendbasket.pl +++ b/basket/sendbasket.pl @@ -122,6 +122,7 @@ if ( $email_add ) { if ( $template_res =~ /
(.*)/s ) { $email_header = $1; $email_header =~ s|\n?(.*)\n?|$1|; + $email_header = encode_qp($email_header); } my $email_file = "basket.txt"; @@ -133,19 +134,12 @@ if ( $email_add ) { if ( $template_res =~ /(.*)/s ) { $body = $1; $body =~ s|\n?(.*)\n?|$1|; - $body = encode("UTF-8", encode_qp($body)); + $body = encode_qp($body); } my $boundary = "====" . time() . "===="; - # $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\""; - # - # $email_header = encode_qp($email_header); - # - # $boundary = "--".$boundary; - # - # # Writing mail - # $mail{body} = + # Writing mail $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\""; my $isofile = encode_base64(encode("UTF-8", $iso2709)); $boundary = '--' . $boundary; diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index ca3a973638..5821bea9fe 100755 --- a/opac/opac-sendbasket.pl +++ b/opac/opac-sendbasket.pl @@ -138,6 +138,7 @@ if ( $email_add ) { if ( $template_res =~ /
(.*)/s ) { $email_header = $1; $email_header =~ s|\n?(.*)\n?|$1|; + $email_header = encode_qp($email_header); } my $email_file = "basket.txt"; @@ -149,7 +150,7 @@ if ( $email_add ) { if ( $template_res =~ /(.*)/s ) { $body = $1; $body =~ s|\n?(.*)\n?|$1|; - $body = encode("UTF-8", encode_qp($body)); + $body = encode_qp($body); } $mail{body} = $body; diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl index 3f9b719987..852ef8d4b4 100755 --- a/opac/opac-sendshelf.pl +++ b/opac/opac-sendshelf.pl @@ -135,6 +135,7 @@ if ( $email ) { if ( $template_res =~ /
(.*)/s ) { $email_header = $1; $email_header =~ s|\n?(.*)\n?|$1|; + $email_header = encode_qp($email_header); } my $email_file = "list.txt"; @@ -146,7 +147,7 @@ if ( $email ) { if ( $template_res =~ /(.*)/s ) { $body = $1; $body =~ s|\n?(.*)\n?|$1|; - $body = encode("UTF-8", encode_qp($body)); + $body = encode_qp($body); } my $boundary = "====" . time() . "===="; diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl index cc3afde3fb..9866671971 100755 --- a/virtualshelves/sendshelf.pl +++ b/virtualshelves/sendshelf.pl @@ -126,6 +126,7 @@ if ( $email ) { if ( $template_res =~ /
(.*)/s ) { $email_header = $1; $email_header =~ s|\n?(.*)\n?|$1|; + $email_header = encode_qp($email_header); } my $email_file = "list.txt"; @@ -137,7 +138,7 @@ if ( $email ) { if ( $template_res =~ /(.*)/s ) { $body = $1; $body =~ s|\n?(.*)\n?|$1|; - $body = encode("UTF-8", encode_qp($body)); + $body = encode_qp($body); } my $boundary = "====" . time() . "===="; -- 2.39.5