projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 11771 - Use validation plugin when creating new MARC framework tag
[koha_fer]
/
opac
/
opac-sendbasket.pl
diff --git
a/opac/opac-sendbasket.pl
b/opac/opac-sendbasket.pl
index
a3a4eb8
..
ca3a973
100755
(executable)
--- a/
opac/opac-sendbasket.pl
+++ b/
opac/opac-sendbasket.pl
@@
-27,7
+27,6
@@
use Carp;
use Mail::Sendmail;
use MIME::QuotedPrint;
use MIME::Base64;
use Mail::Sendmail;
use MIME::QuotedPrint;
use MIME::Base64;
-use HTML::FormatText;
use C4::Biblio;
use C4::Items;
use C4::Auth;
use C4::Biblio;
use C4::Items;
use C4::Auth;
@@
-128,25
+127,33
@@
if ( $email_add ) {
my $body;
# Analysing information and getting mail properties
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 = "";
}
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 = $1;
+ $email_header =~ s|\n?(.*)\n?|$1|;
}
my $email_file = "basket.txt";
}
my $email_file = "basket.txt";
- if ( $template_res =~ /<FILENAME>
\n(.*)\n?
<END_FILENAME>/s ) {
+ if ( $template_res =~ /<FILENAME>
(.*)
<END_FILENAME>/s ) {
$email_file = $1;
$email_file = $1;
+ $email_file =~ s|\n?(.*)\n?|$1|;
}
}
- if ( $template_res =~ /<MESSAGE>
\n(.*)\n?
<END_MESSAGE>/s ) {
+ if ( $template_res =~ /<MESSAGE>
(.*)
<END_MESSAGE>/s ) {
$body = $1;
$body = $1;
+ $body =~ s|\n?(.*)\n?|$1|;
+ $body = encode("UTF-8", encode_qp($body));
}
}
+ $mail{body} = $body;
+
my $boundary = "====" . time() . "====";
$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
my $boundary = "====" . time() . "====";
$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";