Bugzilla – Attachment 22981 Details for
Bug 11248
Problems with translated list email sent
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED OFF] Bug 11248: Encoding issue on sending a list (INTRANET)
SIGNED-OFF-Bug-11248-Encoding-issue-on-sending-a-l.patch (text/plain), 10.27 KB, created by
Katrin Fischer
on 2013-11-17 19:34:17 UTC
(
hide
)
Description:
[SIGNED OFF] Bug 11248: Encoding issue on sending a list (INTRANET)
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-11-17 19:34:17 UTC
Size:
10.27 KB
patch
obsolete
>From 462941da46798614934497f0205f38962a83feb1 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Thu, 14 Nov 2013 14:00:46 +0100 >Subject: [PATCH] [SIGNED OFF] Bug 11248: Encoding issue on sending a list > (INTRANET) > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Sending an intranet list from translated templates requires >a new list template for the intranet. I have added the needed >changes in a follow-up. >--- > .../prog/en/modules/virtualshelves/sendshelf.tt | 185 +++++++++++++++++---- > virtualshelves/sendshelf.pl | 21 ++- > 2 files changed, 167 insertions(+), 39 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt >index 12e53ee..644e7d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt >@@ -2,44 +2,165 @@ > Your List : [% shelfname %] > <END_SUBJECT> > >+[% USE HtmlToText %] >+[% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %] >+[% myhtmltext | html2text %] >+ > <HEADER> >-Hi, >+[% FILTER html2text %] >+ <p>Hi,</p> >+ >+ <p>Here is your list called [% shelfname %], sent from our online catalog.</p> > >-Here is your list called [% shelfname %], sent from our online catalog. >+ <p>Please note that the attached file is a MARC bibliographic records file >+ which can be imported into a Personal Bibliographic Software like EndNote, >+ Reference Manager or ProCite.</p> >+ <hr/> >+[% END %] > >-Please note that the attached file is a MARC bibliographic records file >-which can be imported into a Personal Bibliographic Software like EndNote, >-Reference Manager or ProCite. > <END_HEADER> > > <MESSAGE> >---------------------------------------------- >-[% IF ( comment ) %] >-[% comment %] >-[% END %] >-[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle.size ) %] [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %][% subtitle.subfield %][% END %][% END %][% IF ( BIBLIO_RESULT.author ) %] >- >-by [% BIBLIO_RESULT.author %][% END %] >-[% IF ( BIBLIO_RESULT.MARCAUTHORS.size ) %] >-Additional author(s): [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %] [% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %] >-ISBN: [% BIBLIO_RESULT.ISBN %][% END %] >-[% IF ( BIBLIO_RESULT.publishercode ) %]Published by: [% BIBLIO_RESULT.publishercode %][% END %][% IF ( BIBLIO_RESULT.publicationyear ) %] in [% END %][% BIBLIO_RESULT.publicationyear %][% IF ( BIBLIO_RESULT.pages ) %], [% END %][% BIBLIO_RESULT.pages %][% IF ( BIBLIO_RESULT.size ) %], [% END %][% BIBLIO_RESULT.size %][% IF ( BIBLIO_RESULT.collection ) %] >-Collection: [% BIBLIO_RESULT.seriestitle %][% END %][% IF ( BIBLIO_RESULT.subject ) %] >-Subject: [% BIBLIO_RESULT.subject %][% END %][% IF ( BIBLIO_RESULT.copyrightdate ) %] >-Copyright year: [% BIBLIO_RESULT.copyrightdate %][% END %][% IF ( BIBLIO_RESULT.notes ) %] >-Notes : [% BIBLIO_RESULT.notes %][% END %][% IF ( BIBLIO_RESULT.unititle ) %] >-Unified title: [% BIBLIO_RESULT.unititle %][% END %][% IF ( BIBLIO_RESULT.serial ) %] >-Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %] >-Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %] >-Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %] >-LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %] >-URL : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %] >-In the online catalog: >- http://[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %] >-Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] >- [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %] >- >---------------------------------------------- >+[% FILTER html2text %] >+ >+ [% IF comment %] >+ <p>[% comment %]</p> >+ <hr/> >+ [% END %] >+ <ol> >+ [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] >+ <li> >+ <span> >+ [% BIBLIO_RESULT.title %] >+ [% IF ( BIBLIO_RESULT.subtitle.size ) %] >+ [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %] >+ [% subtitle.subfield %] >+ [% END %] >+ [% END %] >+ </span> >+ >+ <p> >+ [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] >+ <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %] >+ >+ [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] >+ [% IF ( BIBLIO_RESULT.author ) %]; [% END %] >+ [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] >+ [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] >+ [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %] >+ [% END %] >+ [% UNLESS ( loop.last ) %];[% END %] >+ [% END %] >+ [% END %] >+ </span><br/> >+ [% END %] >+ >+ [% IF ( BIBLIO_RESULT.ISBN && BIBLIO_RESULT.size > 0 ) %] >+ <span> >+ ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %] >+ [% isbn.marcisbn %] >+ [% UNLESS ( loop.last ) %]; [% END %] >+ [% END %] >+ </span><br/> >+ [% END %] >+ >+ [% IF BIBLIO_RESULT.publishercode %] >+ <span> >+ Published by: [% BIBLIO_RESULT.publishercode %] >+ [% IF ( BIBLIO_RESULT.publicationyear ) %] >+ in [% BIBLIO_RESULT.publicationyear %] >+ [% END %] >+ [% IF ( BIBLIO_RESULT.pages ) %] >+ , [% BIBLIO_RESULT.pages %] >+ [% END %] >+ [% IF BIBLIO_RESULT.size %] >+ , [% BIBLIO_RESULT.size %] >+ [% END %] >+ </span><br/> >+ [% END %] >+ >+ [% IF BIBLIO_RESULT.collection %] >+ <span> >+ Collection: [% BIBLIO_RESULT.seriestitle %] >+ </span><br/> >+ [% END %] >+ >+ [% IF ( BIBLIO_RESULT.subject ) %] >+ <span> >+ Subject: [% BIBLIO_RESULT.subject %] >+ <span><br/> >+ [% END %] >+ >+ [% IF ( BIBLIO_RESULT.copyrightdate ) %] >+ <span> >+ Copyright year: [% BIBLIO_RESULT.copyrightdate %] >+ </span><br/> >+ [% END %] >+ >+ [% IF ( BIBLIO_RESULT.notes ) %] >+ <span> >+ Notes : [% BIBLIO_RESULT.notes %] >+ </span><br/> >+ [% END %] >+ >+ [% IF ( BIBLIO_RESULT.unititle ) %] >+ <span> >+ Unified title: [% BIBLIO_RESULT.unititle %] >+ </span><br/> >+ [% END %] >+ >+ [% IF ( BIBLIO_RESULT.serial ) %] >+ <span> >+ Serial: [% BIBLIO_RESULT.serial %] >+ </span><br/> >+ [% END %] >+ >+ [% IF ( BIBLIO_RESULT.dewey ) %] >+ <span> >+ Dewey: [% BIBLIO_RESULT.dewey %] >+ </span><br/> >+ [% END %] >+ >+ [% IF ( BIBLIO_RESULT.classification ) %] >+ <span> >+ Classification: [% BIBLIO_RESULT.classification %] >+ </span><br/> >+ [% END %] >+ >+ [% IF ( BIBLIO_RESULT.lccn ) %] >+ <span> >+ LCCN: [% BIBLIO_RESULT.lccn %] >+ </span><br/> >+ [% END %] >+ [% IF ( BIBLIO_RESULT.url ) %] >+ <span> >+ URL: [% BIBLIO_RESULT.url %] >+ </span> >+ [% END %] >+ </p> >+ >+ [% IF ( OPACBaseURL ) %] >+ <p> >+ In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] >+ </p> >+ [% END %] >+ [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %] >+ <p>Items: >+ <ul> >+ [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li> >+ [% ITEM_RESULT.branchname %] >+ [% ITEM_RESULT.location %] >+ [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %] >+ [% ITEM_RESULT.barcode %] >+ </li>[% END %] >+ </ul> >+ </p> >+ [% END %] >+ <hr/> >+ </li> >+ [% END %] >+ </ol> > > [% END %] >+ > <END_MESSAGE> >diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl >index 37a98ec..cc3afde 100755 >--- a/virtualshelves/sendshelf.pl >+++ b/virtualshelves/sendshelf.pl >@@ -21,7 +21,7 @@ use strict; > use warnings; > > use CGI; >-use Encode qw(encode); >+use Encode qw(decode encode); > use Carp; > > use Mail::Sendmail; >@@ -116,22 +116,29 @@ if ( $email ) { > my $body; > > # Analysing information and getting mail properties >- if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) { >- $mail{'subject'} = $1; >+ if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) { >+ $mail{subject} = $1; >+ $mail{subject} =~ s|\n?(.*)\n?|$1|; > } > else { $mail{'subject'} = "no subject"; } > > my $email_header = ""; >- if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) { >+ if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) { > $email_header = $1; >+ $email_header =~ s|\n?(.*)\n?|$1|; > } > >- my $email_file = "basket.txt"; >- if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) { >+ my $email_file = "list.txt"; >+ if ( $template_res =~ /<FILENAME>(.*)<END_FILENAME>/s ) { > $email_file = $1; >+ $email_file =~ s|\n?(.*)\n?|$1|; > } > >- if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = encode_qp($1); } >+ if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) { >+ $body = $1; >+ $body =~ s|\n?(.*)\n?|$1|; >+ $body = encode("UTF-8", encode_qp($body)); >+ } > > my $boundary = "====" . time() . "===="; > >-- >1.8.3.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11248
:
22927
|
22928
|
22929
|
22980
|
22981
|
22982
|
22983
|
22984
|
23360
|
23369
|
24140
|
24141
|
24142