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

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt (-28 / +79 lines)
Lines 2-42 Link Here
2
Your cart
2
Your cart
3
<END_SUBJECT>
3
<END_SUBJECT>
4
4
5
<HEADER>
5
[% USE HtmlToText %]
6
Hi,
6
[% myhtml FILTER html2text(leftmargin => 0, rightmargin => 50) %]
7
[% myhtmltext | html2text %]
7
8
8
[% firstname %] [% surname %] sent you a cart from our online catalog.
9
<HEADER>
10
[% FILTER html2text %]
11
<p>Hi,
12
</p>
13
<p>[% firstname %] [% surname %] sent you a cart from our online catalog.</p>
9
14
10
Please note that the attached file is a MARC bibliographic records file
15
<p>Please note that the attached file is a MARC bibliographic records file
11
which can be imported into personal bibliographic software like EndNote,
16
which can be imported into personal bibliographic software like EndNote,
12
Reference Manager or ProCite.
17
Reference Manager or ProCite.</p>
18
[% END %]
13
<END_HEADER>
19
<END_HEADER>
14
20
15
<MESSAGE>
21
<MESSAGE>
16
---------------------------------------------
22
[% FILTER html2text %]
17
[% IF ( comment ) %]
23
<hr/>
18
[% comment %]
19
[% END %]
20
[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %][% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
21
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 ) %]; [% ELSE %][% END %][% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %]
22
ISBN: [% BIBLIO_RESULT.ISBN %][% END %]
23
[% 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 ) %]
24
Collection: [% BIBLIO_RESULT.seriestitle %][% END %][% IF ( BIBLIO_RESULT.subject ) %]
25
Subject: [% BIBLIO_RESULT.subject %][% END %][% IF ( BIBLIO_RESULT.copyrightdate ) %]
26
Copyright year: [% BIBLIO_RESULT.copyrightdate %][% END %][% IF ( BIBLIO_RESULT.notes ) %]
27
Notes : [% BIBLIO_RESULT.notes %][% END %][% IF ( BIBLIO_RESULT.unititle ) %]
28
Unified title: [% BIBLIO_RESULT.unititle %][% END %][% IF ( BIBLIO_RESULT.serial ) %]
29
Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %]
30
Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
31
Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
32
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
33
URL : [% BIBLIO_RESULT.url %][% END %]
34
In the online catalog:
35
[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %]
36
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
37
	[% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
38
24
39
---------------------------------------------
25
[% IF comment %]
26
<p>[% comment %]</p>
27
<hr/>
28
[% END %]
40
29
30
<ol>
31
[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
32
<li>
33
<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber= [% BIBLIO_RESULT.biblionumber %]">[% BIBLIO_RESULT.title %]</a>
34
[% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %]
35
<ul>
36
[% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
37
<li>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 ) %]; [% ELSE %][% END %][% END %][% END %][% END %]</li>
38
[% IF ( BIBLIO_RESULT.ISBN ) %]
39
<li>ISBN: [% BIBLIO_RESULT.ISBN %]</li>
40
[% END %]
41
[% IF BIBLIO_RESULT.publishercode %]
42
<li>
43
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 %]
44
</li>
45
[% END %]
46
[% IF BIBLIO_RESULT.collection %]
47
<li>Collection: [% BIBLIO_RESULT.seriestitle %]</li>
48
[% END %]
49
[% IF ( BIBLIO_RESULT.subject ) %]
50
<li>Subject: [% BIBLIO_RESULT.subject %]<li>
51
[% END %]
52
[% IF ( BIBLIO_RESULT.copyrightdate ) %]
53
<li>Copyright year: [% BIBLIO_RESULT.copyrightdate %]</li>
54
[% END %]
55
[% IF ( BIBLIO_RESULT.notes ) %]
56
<li>Notes : [% BIBLIO_RESULT.notes %]</li>
57
[% END %]
58
[% IF ( BIBLIO_RESULT.unititle ) %]
59
<li>Unified title: [% BIBLIO_RESULT.unititle %]</li>
60
[% END %]
61
[% IF ( BIBLIO_RESULT.serial ) %]
62
<li>Serial: [% BIBLIO_RESULT.serial %]</li>
63
[% END %]
64
[% IF ( BIBLIO_RESULT.dewey ) %]
65
<li>Dewey: [% BIBLIO_RESULT.dewey %]</li>
66
[% END %]
67
[% IF ( BIBLIO_RESULT.classification ) %]
68
<li>Classification: [% BIBLIO_RESULT.classification %]</li>
69
[% END %]
70
[% IF ( BIBLIO_RESULT.lccn ) %]
71
<li>LCCN: [% BIBLIO_RESULT.lccn %]</li>
72
[% END %]
73
[% IF ( BIBLIO_RESULT.url ) %]
74
<li>URL : [% BIBLIO_RESULT.url %]</li>
75
[% END %]
76
<li>Items:
77
<ul>
78
[% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
79
<li>
80
[% ITEM_RESULT.branchname %]
81
[% ITEM_RESULT.location %]
82
[% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %]
83
[% ITEM_RESULT.barcode %]
84
</li>
85
[% END %]
86
</ul>
87
</ul>
88
</li>
89
[% END %]
90
</ol>
41
[% END %]
91
[% END %]
42
<END_MESSAGE>
92
<END_MESSAGE>
93
(-)a/opac/opac-sendbasket.pl (-15 / +10 lines)
Lines 25-30 use Carp; Link Here
25
use Mail::Sendmail;
25
use Mail::Sendmail;
26
use MIME::QuotedPrint;
26
use MIME::QuotedPrint;
27
use MIME::Base64;
27
use MIME::Base64;
28
use HTML::FormatText;
28
use C4::Biblio;
29
use C4::Biblio;
29
use C4::Items;
30
use C4::Items;
30
use C4::Auth;
31
use C4::Auth;
Lines 118-156 if ( $email_add ) { Link Here
118
    my $body;
119
    my $body;
119
120
120
    # Analysing information and getting mail properties
121
    # Analysing information and getting mail properties
121
    if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
122
    if ( $template_res =~ /<SUBJECT>\n(.*)\n?<END_SUBJECT>/s ) {
122
        $mail{'subject'} = $1;
123
        $mail{'subject'} = $1;
123
    }
124
    }
124
    else { $mail{'subject'} = "no subject"; }
125
    else { $mail{'subject'} = "no subject"; }
125
126
126
    my $email_header = "";
127
    my $email_header = "";
127
    if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
128
    if ( $template_res =~ /<HEADER>\n(.*)\n?<END_HEADER>/s ) {
128
        $email_header = $1;
129
        $email_header = $1;
129
    }
130
    }
130
131
131
    my $email_file = "basket.txt";
132
    my $email_file = "basket.txt";
132
    if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
133
    if ( $template_res =~ /<FILENAME>\n(.*)\n?<END_FILENAME>/s ) {
133
        $email_file = $1;
134
        $email_file = $1;
134
    }
135
    }
135
136
136
    if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = encode_qp($1); }
137
    if ( $template_res =~ /<MESSAGE>\n(.*)\n?<END_MESSAGE>/s ) {
137
138
        $body = $1;
139
    }
140
    
138
    my $boundary = "====" . time() . "====";
141
    my $boundary = "====" . time() . "====";
139
142
140
    #     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
141
    #
142
    #     $email_header = encode_qp($email_header);
143
    #
144
    #     $boundary = "--".$boundary;
145
    #
146
    #     # Writing mail
147
    #     $mail{body} =
148
    $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
143
    $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
149
    my $isofile = encode_base64(encode("UTF-8", $iso2709));
144
    my $isofile = encode_base64(encode("UTF-8", $iso2709));
150
    $boundary = '--' . $boundary;
145
    $boundary = '--' . $boundary;
151
    $mail{body} = <<END_OF_BODY;
146
    $mail{body} = <<END_OF_BODY;
152
$boundary
147
$boundary
153
Content-Type: text/plain; charset="utf-8"
148
MIME-Version: 1.0
149
Content-Type: text/plain; charset="UTF-8"
154
Content-Transfer-Encoding: quoted-printable
150
Content-Transfer-Encoding: quoted-printable
155
151
156
$email_header
152
$email_header
157
- 

Return to bug 8062